diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4fcfb745..b542d15f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,7 +31,7 @@ jobs: - name: Prepare run: mkdir RPMS - - name: Build armv7hl + - name: Build armv7hl on 3.1.0.12 uses: coderus/github-sfos-build@old-stable with: release: 3.1.0.12 diff --git a/bin/harbour-storeman-installer b/bin/harbour-storeman-installer index 22b893ea..3a3ed665 100644 --- a/bin/harbour-storeman-installer +++ b/bin/harbour-storeman-installer @@ -38,13 +38,13 @@ exec <&- # Close StdIN exec >> "$logfile" # Redirect StdOUT, appendingly exec 2>&1 # Map StdERR to (redirected) StdOUT -umask 7113 # The first octal digit is ignored by most implementations +umask 113 [ "$PWD" = / ] || cd / # Set PWD to /, if not already -# Prefix first output with three linebreaks, if logfile size > 0 +# Prefix first output with one plus two linebreaks, if logfile size > 0 linebreaks="" if [ -s "$logfile" ] -then linebreaks="\n\n------------------------------------------------------------------------------------------------------------\n\n\n" +then linebreaks="\n-------------------------------------\n\n" fi # Write first entry to logfile: diff --git a/rpm/harbour-storeman-installer.rpmlintrc b/rpm/harbour-storeman-installer.rpmlintrc new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/rpm/harbour-storeman-installer.rpmlintrc @@ -0,0 +1 @@ + diff --git a/rpm/harbour-storeman-installer.spec b/rpm/harbour-storeman-installer.spec index db03ccd3..230dd8cf 100644 --- a/rpm/harbour-storeman-installer.spec +++ b/rpm/harbour-storeman-installer.spec @@ -6,17 +6,17 @@ Name: harbour-storeman-installer # natural number greater or equal to 1, which may be prefixed with one of # {alpha,beta,rc,release} (e.g., "beta3"). For details and reasons, see # https://github.com/storeman-developers/harbour-storeman-installer/wiki/Git-tag-format -Version: 1.4.4 -Release: release7 +Version: 1.5.0 +Release: release1 Group: Applications/System URL: https://github.com/storeman-developers/%{name} -# These "Source:" lines below require that the value of %%{name} is also the +# These "Source0:" lines below require that the value of %%{name} is also the # project name at GitHub and the value of %%{version} is also the name of a # correspondingly set git-tag. -# Alternative links, which also download ${projectname}-${tagname}.tar.gz: -# Source: %%{url}/archive/%%{version}.tar.gz -# Source: %%{url}/archive/refs/tags/%%{version}.tar.gz -Source: %{url}/archive/%{version}/%{name}-%{version}.tar.gz +Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz +# Note that the rpmlintrc file must be named so according to +# https://en.opensuse.org/openSUSE:Packaging_checks#Building_Packages_in_spite_of_errors +Source99: %{name}.rpmlintrc BuildArch: noarch BuildRequires: desktop-file-utils # For details on "Requires:" statements, especially "Requires(a,b,c):", see: @@ -53,7 +53,7 @@ Requires: sailfish-version >= 3.1.0 # Provide an automatically presented update candidate for an installed Storeman < 0.2.99: Conflicts: harbour-storeman < 0.2.99 Obsoletes: harbour-storeman < 0.2.99 -Provides: harbour-storeman = 0.3.0~2 +Provides: harbour-storeman = 0.3.0~3 %global localauthority_dir polkit-1/localauthority/50-local.d %global hicolor_icons_dir %{_datadir}/icons/hicolor @@ -72,9 +72,10 @@ of the device and its installed SailfishOS release. PackageName: Storeman Installer for SailfishOS Type: desktop-application Categories: - - Utilities - System + - Utility - Network + - Settings - PackageManager DeveloperName: olf (Olf0) Custom: @@ -90,7 +91,7 @@ Screenshots: - %{screenshots_url}screenshot-screenshot-storeman-08.png - %{screenshots_url}screenshot-screenshot-storeman-09.png Url: - Homepage: %{url} + Homepage: https://openrepos.net/content/olf/storeman-installer Help: %{url}/issues Bugtracker: %{url}/issues Donation: https://openrepos.net/donate @@ -126,9 +127,9 @@ desktop-file-install --delete-original --dir=%{buildroot}%{_datadir}/application if [ ! -e %{logfile} ] then curmask="$(umask)" - umask 7022 # The first octal digit is ignored by most implementations + umask 022 [ ! -e %{logdir} ] && mkdir -p %{logdir} - umask 7113 + umask 113 touch %{logfile} # Not necessary, because umask is set: # chmod 0664 %%{logfile} @@ -177,110 +178,6 @@ exit 0 #%%{_sysconfdir}/%%{localauthority_dir}/50-%%{name}.pkla %changelog -* Tue Jan 24 2023 olf - 1.4.4-release7 -- Apply changes from v2.1.7 to v1.x.y branch -- Fix privilege issue on SailfishOS > 4.x by returning to the classic access rights for `/usr/bin/*`: 0755,root,root -* Sun Jan 22 2023 olf - 2.1.7-release6 -- Create double-fork-in-shell.md -- Create cache-docker-images_github-ci.md (#249, #250, #251, #252, #253) -- Update and enhance CI workflow script (#244, #245, #247, #254) -- Enhance spec file and its comments (#247) -* Sun Dec 25 2022 olf - 2.1.6-release5 -- Overhaul README while updating it for v1.3.8+ and v2+ -- Minor changes -- First regular release of v2, which is available at OpenRepos and SailfishOS:Chum -* Fri Dec 23 2022 olf - 1.4.3-release6 -- Apply changes from v2.1.5 to v1.x.y branch -* Fri Dec 23 2022 olf - 2.1.5-release4 -- Beautifications of code and log output, etc. -* Thu Dec 22 2022 olf - 1.4.2-release5 -- Apply changes from v2.1.4 to v1.x.y branch -* Thu Dec 22 2022 olf - 2.1.4-release3 -- Handle a stalled packagekit better -* Wed Dec 21 2022 olf - 1.4.1-release4 -- Apply "more clean-up and optimisations" from v2.1.2 to v1.x.y branch -* Wed Dec 21 2022 olf - 2.1.2-release2 -- More clean-up and optimisations -* Tue Dec 20 2022 olf - 1.4.0-release3 -- Clean up and optimise a bit -* Tue Dec 20 2022 olf - 2.1.1-release1 -- Clean up -- Optimise -* Mon Dec 19 2022 olf - 1.3.9-release2 -- Simplify -* Sat Dec 17 2022 olf - 1.3.8-release1 -- Set umask and PWD in harbour-storeman-installer script -- Start installation of harbour-storeman fully detached ("double fork" / daemonize) -- Print version of harbour-storeman-installer package in the log file entry of each run -- Consistently set files and limit access to group "ssu" -- Refactor and enhance failure of: pkcon repo-set-data harbour-storeman-obs refresh-now true -- Fix according to double-fork-in-shell-code.md: https://github.com/storeman-developers/harbour-storeman-installer/blob/master/double-fork-in-shell-code.md -* Sat Dec 17 2022 olf - 2.0.49-release1.detached.script -- Fixes, improvements and simplifications -* Wed Dec 14 2022 olf - 2.0.45-release1.detached.script -- Finalise defer-inst-via-detached-script branch -- Specifically: Only wait for %%posttrans scriptlet to finish, not its parent process, because that might be the packagekit daemon (calling functions of libzypp directly; pkcon is just a frontend, which triggers the packagekit daemon to take action), which usually has an idle timeout of 600 seconds (10 minutes) set. -* Sun Dec 11 2022 olf - 2.0.22-release1.detached.script -- Start harbour-storeman-installer script fully detached ("double fork" / daemonize) in %%posttrans -- Update defer-inst-via-detached-script branch with changes for v1.3.6: - - Set umask and PWD in harbour-storeman-installer script - - Start installation of harbour-storeman fully detached ("double fork" / daemonize) - - Print version of harbour-storeman-installer package in the log file entry of each run - - Refactor and enhance failure of: pkcon repo-set-data harbour-storeman-obs refresh-now true -* Fri Dec 9 2022 olf - 1.3.5-release1 -- Update harbour-storeman-installer script to version in defer-inst-via-detached-script branch (#144) -- Re-adapt harbour-storeman-installer script for interactive use (#144) -- Log file needs to be writeable (#146) -* Wed Dec 7 2022 olf - 2.0.12-release1.detached.script -- Start the harbour-storeman-installer script as detached ("&") in the %%posttrans scriptlet -- Thus eliminating the necessity for user interaction(s), besides triggering the installation of Storeman Installer -* Sun Dec 4 2022 olf - 1.3.4-release1 -- Radically rewrite harbour-storeman-installer script in /usr/bin (#136) -- The harbour-storeman-installer script ultimately issues pkcon install harbour-storeman … & (i.e., also detached), allowing this script to be removed in the process of the Storeman installation -- Do not use pkcon's option -n; it is slow enough (#134) -* Sat Dec 3 2022 olf - 1.3.3-release1 -- Start pkcon commands with the options -pn (#130) -- Tidy spec file as implemented in v2.0 (#130) -- Clarify comment (#128) -* Thu Dec 1 2022 olf - 1.3.2-release1 -- Refine %%post scriptlet of the spec file (#96) -* Wed Nov 30 2022 olf - 1.3.1-release1 -- Fix auto-removing Storeman < 0.3.0 on SailfishOS ≥ 3.1.0 (#109) -* Tue Nov 29 2022 olf - 1.3.0-release1 -- Now should automatically remove an installed Storeman < 0.3.0 when being installed (#95) -- Enhance multiple aspects of the spec file (#89, #91, #93) -- Many small enhancements of comments, strings and other non-code assets -- Storeman Installer ≥ 1.3.0 is a prerequisite for Storeman ≥ 0.3.2 -* Sat Jun 4 2022 olf - 1.2.9-release1 -- pkcon expects options before the command (#74) -* Sun May 15 2022 olf - 1.2.8-release1 -- Requires: sailfish-version >= 3.1.0 (#61), because this is the oldest SailfishOS release any Storeman version installed by Storeman Installer will work on. -* Sun Apr 10 2022 olf - 1.2.7-release1 -- Fix icon deployment -* Thu Apr 7 2022 olf - 1.2.6-release1 -- Release tags must not carry a prepended "v" any longer and solely consist of a simple semantic version number a.b.c, because … (see next point) -- Specify a correct source link at GitHub (#42) -- Address a couple of rpmlint complaints -* Sun Mar 20 2022 olf - 1.2.2-1 -- .desktop file: Trivially bail out of SailJail #38 -* Thu Mar 17 2022 olf - 1.2.1-1 -- spec file: Add SailfishOS:Chum metadata (#23) plus spec file: Add categories (#31) and #30 -- Create help-template.md (#24) -- Create and enhance README (#25, #29, #30, #32, #33, #34, #35) -* Sun Mar 13 2022 olf - 1.2.0-1 -- Change group from users to ssu -- polkit: Limit allowed actions to the necessary ones -- Do not to call Bash -- desktop file: Only label languages by country code -- Create bug-template.md / Create suggestion-template.md -- Create build.yml -- Update repository configuration -- Add URL: to spec file -- Update spec file -* Mon Sep 6 2021 Petr Tsymbarovich - 1.1.0-1 -- Update translations -* Sun Aug 22 2021 Petr Tsymbarovich - 1.0.1-1 -- Update translations -* Thu Aug 19 2021 Petr Tsymbarovich - 1.0.0-1 -- Initial release +* Thu Sep 9 1999 olf - 99.99.99 +- See %{url}/releases