Changes - SailfishOS Open Build Service

Changes of Revision 5

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

[-] [+]	Changed	_service:tar_git:patchmanager.changes
@@ -1,3 +1,6 @@ +* Tue Jan 03 2023 Peter G <sailfish@nephros.org> - 3.2.3 +- [README] Unify spelling (use BE etc.) and (#318) + * Mon Feb 28 2022 olf <Olf0@users.noreply.github.com> - 3.2.2 - [UI] Allow "Unapply All" menu entry through settings (#283)
[-] [+]	Changed	_service:tar_git:patchmanager.spec ^
@@ -1,4 +1,4 @@ -%define theme sailfish-default +%global theme sailfish-default # These macros should already be defined in the RPMbuild environment, see: rpm --showrc %{!?qtc_qmake5:%define qtc_qmake5 %qmake5} @@ -8,13 +8,13 @@ Name: patchmanager Summary: Allows to manage Patches for SailfishOS -Version: 3.2.2+obs.20220915181414.12.g0a5e816 +Version: 3.2.4+obs.20230116103123.17.g0f8ff4e Release: 1 Group: Qt/Qt License: BSD-3-Clause URL: https://github.com/sailfishos-patches/%{name} -Source0: %{name}-%{version}.tar.bz2 -# Note that it must be named exactly so according to +Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz +# Note that the rpmlintrc file MUST be named exactly so according to # https://en.opensuse.org/openSUSE:Packaging_checks#Building_Packages_in_spite_of_errors Source99: %{name}-rpmlintrc Requires: unzip @@ -38,6 +38,7 @@ BuildRequires: pkgconfig(rpm) BuildRequires: pkgconfig(popt) + %package testcases Summary: Provides test cases for Patchmanager Group: Development @@ -101,19 +102,22 @@ Homepage: https://openrepos.net/content/patchmanager/%{name} Help: %{url}/blob/master/README.md Bugtracker: https://forum.sailfishos.org/t/bugs-in-patchmanager-3-1-0/8552 + Donation: https://openrepos.net/donate %endif %prep -%setup -q -n %{name}-%{version} + +%setup -q + %build %qtc_qmake5 "PROJECT_PACKAGE_VERSION=%{version}" %qtc_make %{?_smp_mflags} + %install -rm -rf %{buildroot} %qmake5_install @@ -128,85 +132,105 @@ mkdir -p %{buildroot}%{_datadir}/%{name}/patches + %pre export NO_PM_PRELOAD=1 -case "$" in -1) -echo "Installing %{name}: pre section" -;; -2) -echo "Updating %{name}: pre section" -# Unapply all patches if Patchmanager 2.x is installed -if [ ! -d /var/lib/patchmanager/ausmt/patches/ ] -then - exit 0 -else - /usr/sbin/patchmanager --unapply-all \|\| true -fi -if [ -n "$(ls -A /var/lib/patchmanager/ausmt/patches/)" ] -then - echo "Unapply all patches before updating %{name}!" - exit 1 -fi +case "$1" in +1) # Installation + echo "Installing %{name}: %%pre section" +;; +[2-9]) # Update + echo "Updating %{name}: %%pre section" + # Disable and deactivate ("unapply") all Patches if Patchmanager 2.x is installed + if [ -d /var/lib/patchmanager/ausmt/patches/ ] + then + /usr/sbin/patchmanager --unapply-all + if [ -n "$(ls -A /var/lib/patchmanager/ausmt/patches/)" ] + then + echo "Do disable ("unapply") all Patches: %{name} must not be updated unless all Patches are inactive!" + exit 1 # An exit N with N ≠ 0 in a %%pre scriptlet might not constitute an + # appropriate way to terminate an update (here: from PM2 to PM3), see e.g., + # https://docs.fedoraproject.org/en-US/packaging-guidelines/Scriptlets/#_syntax + # OTOH, how else might one achieve that?!? + fi + fi +;; +) + echo "Case $1 is not handled in %%pre section of %{name}!" ;; -) echo "Case $ is not handled in pre section of %{name}!" esac +exit 0 + %post export NO_PM_PRELOAD=1 -case "$" in -1) -echo "Installing %{name}: post section" +case "$1" in +1) # Installation + echo "Installing %{name}: %%post section" ;; -2) -echo "Updating %{name}: post section" +[2-9]) # Update + echo "Updating %{name}: %%post section" +;; +) + echo "Case $1 is not handled in %%post section of %{name}!" ;; -) echo "Case $ is not handled in post section of %{name}!" esac sed -i '/libpreload%{name}/ d' /etc/ld.so.preload echo '%{_libdir}/libpreload%{name}.so' >> /etc/ld.so.preload /sbin/ldconfig -if ! grep -qsF 'include whitelist-common-%{name}.local' /etc/firejail/whitelist-common.local; then - echo 'include whitelist-common-%{name}.local' >> /etc/firejail/whitelist-common.local +if ! grep -qsF 'include whitelist-common-%{name}.local' /etc/firejail/whitelist-common.local +then + echo 'include whitelist-common-%{name}.local' >> /etc/firejail/whitelist-common.local fi dbus-send --system --type=method_call --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig systemctl daemon-reload systemctl-user daemon-reload systemctl restart dbus-org.SfietKonstantin.patchmanager.service systemctl restart checkForUpdates-org.SfietKonstantin.patchmanager.timer +exit 0 + %preun export NO_PM_PRELOAD=1 -case "$" in -0) -echo "Uninstalling %{name}: preun section" -systemctl stop dbus-org.SfietKonstantin.patchmanager.service +case "$1" in +0) # Removal ("uninstallation") + echo "Removing %{name}: %%preun section" + systemctl stop checkForUpdates-org.SfietKonstantin.patchmanager.timer + systemctl stop dbus-org.SfietKonstantin.patchmanager.service ;; -1) -echo "Updating %{name}: preun section" +1) # Update + echo "Updating %{name}: %%preun section" +;; +) + echo "Case $1 is not handled in %%preun section of %{name}!" ;; -) echo "Case $ is not handled in preun section of %{name}!" esac +exit 0 + %postun export NO_PM_PRELOAD=1 -case "$" in -0) -echo "Uninstalling %{name}: postun section" -sed -i '/whitelist-common-%{name}.local/ d' /etc/firejail/whitelist-common.local -sed -i '/libpreload%{name}/ d' /etc/ld.so.preload -/sbin/ldconfig -rm -rf /tmp/patchmanager -rm -f /tmp/patchmanager-socket +case "$1" in +0) # Removal ("uninstallation") + echo "Removing %{name}: %%postun section" + sed -i '/whitelist-common-%{name}.local/ d' /etc/firejail/whitelist-common.local + sed -i '/libpreload%{name}/ d' /etc/ld.so.preload + /sbin/ldconfig + rm -rf /tmp/patchmanager + rm -f /tmp/patchmanager-socket +;; +1) # Update + echo "Updating %{name}: %%postun section" ;; -1) -echo "Updating %{name}: postun section" +) + echo "Case $1 is not handled in %%postun section of %{name}!" ;; -) echo "Case $ is not handled in postun section of %{name}!" esac dbus-send --system --type=method_call --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig
	Deleted	_service:tar_git:patchmanager-3.2.2+obs.20220915181414.12.g0a5e816.tar.bz2 ^
	Added	_service:tar_git:patchmanager-3.2.4+obs.20230116103123.17.g0f8ff4e.tar.gz ^