From b541e2af3f39a6c0e9dd17af1be3f75dbbec74a7 Mon Sep 17 00:00:00 2001 From: Sérgio M. Basto Date: May 30 2021 05:34:59 +0000 Subject: Update to lpf-0.2.20210530.d1cb09f --- diff --git a/.gitignore b/.gitignore index ec71264..41382f5 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /lpf-0-fc43f57.tar.gz /lpf-0.1-36e5aa0.tar.gz /lpf-0.2-f1f5dd9.tar.gz +/lpf-0.2.20210530.d1cb09f.tar.gz diff --git a/0001-add-gi.require_version-Gtk-3.0-before-import-Gtk.patch b/0001-add-gi.require_version-Gtk-3.0-before-import-Gtk.patch deleted file mode 100644 index 7c4a0ea..0000000 --- a/0001-add-gi.require_version-Gtk-3.0-before-import-Gtk.patch +++ /dev/null @@ -1,71 +0,0 @@ -From a25c5e33f08e06648fe3840141b208c852a14415 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= -Date: Tue, 24 Jul 2018 03:49:34 +0100 -Subject: [PATCH 1/4] add gi.require_version('Gtk', '3.0') before import Gtk - ---- - scripts/build_error.py | 3 +++ - scripts/lpf_gui_base.py | 3 +++ - scripts/notify.py | 3 +++ - scripts/update.py | 3 +++ - 4 files changed, 12 insertions(+) - -diff --git a/scripts/build_error.py b/scripts/build_error.py -index 0692b48..3ea6617 100644 ---- a/scripts/build_error.py -+++ b/scripts/build_error.py -@@ -4,6 +4,9 @@ import os.path - import os - os.environ['NO_AT_BRIDGE'] = '0' - -+import gi -+gi.require_version('Gtk', '3.0') -+ - from gi.repository import Gtk # pylint:disable=no-name-in-module - - -diff --git a/scripts/lpf_gui_base.py b/scripts/lpf_gui_base.py -index 8813be2..b808d78 100644 ---- a/scripts/lpf_gui_base.py -+++ b/scripts/lpf_gui_base.py -@@ -8,6 +8,9 @@ import subprocess - import sys - import time - -+import gi -+gi.require_version('Gtk', '3.0') -+ - from gi.repository import Gtk # pylint:disable=no-name-in-module - from gi.repository import Gdk # pylint:disable=no-name-in-module - from gi.repository import GObject # pylint:disable=no-name-in-module -diff --git a/scripts/notify.py b/scripts/notify.py -index 12e2384..3bd13be 100644 ---- a/scripts/notify.py -+++ b/scripts/notify.py -@@ -5,6 +5,9 @@ import os.path - import subprocess - os.environ['NO_AT_BRIDGE'] = '0' - -+import gi -+gi.require_version('Gtk', '3.0') -+ - from gi.repository import Gtk # pylint: disable=no-name-in-module - from gi.repository import GObject # pylint: disable=no-name-in-module - -diff --git a/scripts/update.py b/scripts/update.py -index 5ba2ea9..56fb331 100644 ---- a/scripts/update.py -+++ b/scripts/update.py -@@ -6,6 +6,9 @@ import signal - import subprocess - import sys - -+import gi -+gi.require_version('Gtk', '3.0') -+ - from gi.repository import GLib # pylint: disable=no-name-in-module - from gi.repository import Gtk # pylint: disable=no-name-in-module - --- -2.14.4 - diff --git a/0002-Fix-lpf-gui-behavior-and-a-strange-message.patch b/0002-Fix-lpf-gui-behavior-and-a-strange-message.patch deleted file mode 100644 index 37509b5..0000000 --- a/0002-Fix-lpf-gui-behavior-and-a-strange-message.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 01a3fd7a24ceec0a419f11259e7be78ad29b8328 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= -Date: Tue, 24 Jul 2018 03:50:33 +0100 -Subject: [PATCH 2/4] Fix lpf-gui behavior and a strange message: - -No such package: "/usr/share/lpf/scripts" ---- - scripts/lpf-gui | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/scripts/lpf-gui b/scripts/lpf-gui -index 22fa69f..27a9759 100755 ---- a/scripts/lpf-gui -+++ b/scripts/lpf-gui -@@ -7,7 +7,7 @@ - import os.path - import sys - --sys.argv.append(os.path.dirname(os.path.realpath(__file__))) -+# sys.argv.append(os.path.dirname(os.path.realpath(__file__))) - - import lpf_gui_base - --- -2.14.4 - diff --git a/0003-Fix-appdata.patch b/0003-Fix-appdata.patch deleted file mode 100644 index 97720ea..0000000 --- a/0003-Fix-appdata.patch +++ /dev/null @@ -1,31 +0,0 @@ -From bb31a2a4cd9b82f15a7651a121bc64a2b92223e9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= -Date: Tue, 24 Jul 2018 04:38:12 +0100 -Subject: [PATCH 3/4] Fix appdata - ---- - appdata/lpf.appdata.xml | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/appdata/lpf.appdata.xml b/appdata/lpf.appdata.xml -index 6074a95..8cff387 100644 ---- a/appdata/lpf.appdata.xml -+++ b/appdata/lpf.appdata.xml -@@ -34,10 +34,12 @@ - - - -- https://github.com/leamas/lpf/raw/devel/appdata/main.png -+ https://github.com/leamas/lpf/raw/devel/appdata/main.png -+ Main windows - - -- https://github.com/leamas/lpf/raw/devel/appdata/details.png -+ https://github.com/leamas/lpf/raw/devel/appdata/details.png -+ Window with details - - - --- -2.14.4 - diff --git a/0004-bin-bash-usr-bin-bash.patch b/0004-bin-bash-usr-bin-bash.patch deleted file mode 100644 index b375f1e..0000000 --- a/0004-bin-bash-usr-bin-bash.patch +++ /dev/null @@ -1,344 +0,0 @@ -From e7e7b985ab936b5620c56a025f25814b9c3a5638 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= -Date: Tue, 24 Jul 2018 04:41:41 +0100 -Subject: [PATCH 4/4] /bin/bash -> /usr/bin/bash - ---- - scripts/lpf | 2 +- - scripts/lpf-add-group | 2 +- - scripts/lpf-approve | 2 +- - scripts/lpf-build | 2 +- - scripts/lpf-install | 2 +- - scripts/lpf-kill-pgroup | 2 +- - scripts/lpf-notify | 2 +- - scripts/lpf-pkg-postun | 2 +- - scripts/lpf-pkgbuild | 2 +- - scripts/lpf-scan | 2 +- - scripts/lpf-setup-pkg | 2 +- - scripts/lpf-sudo-builddep | 2 +- - scripts/lpf-sudo-install | 2 +- - scripts/lpf-update | 2 +- - scripts/mockbuild-helper | 2 +- - scripts/sudo_askpass | 2 +- - test/make_rpms | 2 +- - test/remove-lpf-packages | 2 +- - test/test-build-fail | 2 +- - test/test-list | 2 +- - test/test-notify | 2 +- - test/test-remove | 2 +- - test/test-remove-lpf | 2 +- - test/test-update-lpf | 2 +- - test/test_lpf.py | 2 +- - tools/build-lpf-pkg | 2 +- - tools/fix-git-setup | 2 +- - tools/make_rpm | 2 +- - tools/version-clean | 2 +- - tools/version-smudge | 2 +- - 30 files changed, 30 insertions(+), 30 deletions(-) - -diff --git a/scripts/lpf b/scripts/lpf -index 14df048..74f3d30 100755 ---- a/scripts/lpf -+++ b/scripts/lpf -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/usr/bin/bash - # - # lpf Local Package Building Service wrapper script - # -diff --git a/scripts/lpf-add-group b/scripts/lpf-add-group -index 7b10244..0cb856d 100755 ---- a/scripts/lpf-add-group -+++ b/scripts/lpf-add-group -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/usr/bin/bash - # - # Add the lpf group to current user. - # -diff --git a/scripts/lpf-approve b/scripts/lpf-approve -index 50183af..ab737b6 100755 ---- a/scripts/lpf-approve -+++ b/scripts/lpf-approve -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/usr/bin/bash - # - # Approve packages in approve-wait state - # -diff --git a/scripts/lpf-build b/scripts/lpf-build -index d4b7b57..d9005de 100755 ---- a/scripts/lpf-build -+++ b/scripts/lpf-build -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/usr/bin/bash - # - # Build packages in approved queues. - # -diff --git a/scripts/lpf-install b/scripts/lpf-install -index 041e8c2..2932841 100755 ---- a/scripts/lpf-install -+++ b/scripts/lpf-install -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/usr/bin/bash - # - # The install command - # -diff --git a/scripts/lpf-kill-pgroup b/scripts/lpf-kill-pgroup -index cba9e96..884091e 100755 ---- a/scripts/lpf-kill-pgroup -+++ b/scripts/lpf-kill-pgroup -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/usr/bin/bash - # - # Use sudo to kill all children. - -diff --git a/scripts/lpf-notify b/scripts/lpf-notify -index 417e721..3ac5534 100755 ---- a/scripts/lpf-notify -+++ b/scripts/lpf-notify -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/usr/bin/bash - # - # - # Notification handling: create, check, hide, remove. Here is -diff --git a/scripts/lpf-pkg-postun b/scripts/lpf-pkg-postun -index 3c2443a..bf1a961 100755 ---- a/scripts/lpf-pkg-postun -+++ b/scripts/lpf-pkg-postun -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/usr/bin/bash - - # Clean up after removed lpf package - # -diff --git a/scripts/lpf-pkgbuild b/scripts/lpf-pkgbuild -index d9232d8..9524e0b 100755 ---- a/scripts/lpf-pkgbuild -+++ b/scripts/lpf-pkgbuild -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/usr/bin/bash - # - # State-changing operations, needs to be run as pkg-build user. - # -diff --git a/scripts/lpf-scan b/scripts/lpf-scan -index a0a11bc..ffc0e2f 100755 ---- a/scripts/lpf-scan -+++ b/scripts/lpf-scan -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/usr/bin/bash - # - # Update package state file - # -diff --git a/scripts/lpf-setup-pkg b/scripts/lpf-setup-pkg -index 2fa507a..1101538 100755 ---- a/scripts/lpf-setup-pkg -+++ b/scripts/lpf-setup-pkg -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/usr/bin/bash - # - # Setup package for build - # -diff --git a/scripts/lpf-sudo-builddep b/scripts/lpf-sudo-builddep -index 9baf166..1eaa4ca 100755 ---- a/scripts/lpf-sudo-builddep -+++ b/scripts/lpf-sudo-builddep -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/usr/bin/bash - # - # Install builddeps. Runs as root, be careful. - -diff --git a/scripts/lpf-sudo-install b/scripts/lpf-sudo-install -index a9d91fb..7305903 100755 ---- a/scripts/lpf-sudo-install -+++ b/scripts/lpf-sudo-install -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/usr/bin/bash - # - # Install rpms, runs as root - be careful. - # -diff --git a/scripts/lpf-update b/scripts/lpf-update -index 0871fbd..6e93b62 100755 ---- a/scripts/lpf-update -+++ b/scripts/lpf-update -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/usr/bin/bash - # - # The update command - -diff --git a/scripts/mockbuild-helper b/scripts/mockbuild-helper -index 0e0f7e8..436bf73 100755 ---- a/scripts/mockbuild-helper -+++ b/scripts/mockbuild-helper -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/usr/bin/bash - # - # Build packages in approved queues. - # -diff --git a/scripts/sudo_askpass b/scripts/sudo_askpass -index c497739..79ac2b0 100755 ---- a/scripts/sudo_askpass -+++ b/scripts/sudo_askpass -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/usr/bin/bash - # - # zenity wrapper used as sudo askpass helper - -diff --git a/test/make_rpms b/test/make_rpms -index 1d78bc7..59ba3b5 100755 ---- a/test/make_rpms -+++ b/test/make_rpms -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/usr/bin/bash - - home=$( readlink -fn $(dirname $0 ))/.. - -diff --git a/test/remove-lpf-packages b/test/remove-lpf-packages -index 918f236..593e557 100755 ---- a/test/remove-lpf-packages -+++ b/test/remove-lpf-packages -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/usr/bin/bash - - for pkg in $( lpf list ); do - to_remove="$to_remove lpf-$pkg" -diff --git a/test/test-build-fail b/test/test-build-fail -index 72bb420..cbf7717 100755 ---- a/test/test-build-fail -+++ b/test/test-build-fail -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/usr/bin/bash - - exec &> test-build-fail.log - set -x -diff --git a/test/test-list b/test/test-list -index 2537336..0ec1d6b 100755 ---- a/test/test-list -+++ b/test/test-list -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/usr/bin/bash - - # Test lpf list outcome. - -diff --git a/test/test-notify b/test/test-notify -index 932c3c2..036d200 100755 ---- a/test/test-notify -+++ b/test/test-notify -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/usr/bin/bash - scriptdir="$( dirname $( readlink -fn $0 ))/../scripts" - source $scriptdir/lpf-defs.bash - exec &> test-notify.log -diff --git a/test/test-remove b/test/test-remove -index d9e479e..b867884 100755 ---- a/test/test-remove -+++ b/test/test-remove -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/usr/bin/bash - - exec 2> test-remove.log - set -x -diff --git a/test/test-remove-lpf b/test/test-remove-lpf -index 5bda631..1d8e2e5 100755 ---- a/test/test-remove-lpf -+++ b/test/test-remove-lpf -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/usr/bin/bash - - exec &> test-remove-lpf.log - set -x -diff --git a/test/test-update-lpf b/test/test-update-lpf -index 790efcf..f750bc2 100755 ---- a/test/test-update-lpf -+++ b/test/test-update-lpf -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/usr/bin/bash - - exec 2> test-update-lpf.log - set -x -diff --git a/test/test_lpf.py b/test/test_lpf.py -index 3449ecc..81148a4 100644 ---- a/test/test_lpf.py -+++ b/test/test_lpf.py -@@ -64,7 +64,7 @@ class TestLpf(unittest.TestCase): - def test_notify(self): - ''' Test notifications i. e., lpf-notify. ''' - with open('/dev/null', 'w') as devnull: -- subprocess.check_call(['/bin/bash', '-c', './test-notify'], -+ subprocess.check_call(['/usr/bin/bash', '-c', './test-notify'], - stdout=devnull) - - if __name__ == "__main__": -diff --git a/tools/build-lpf-pkg b/tools/build-lpf-pkg -index 84f1354..bb14a22 100755 ---- a/tools/build-lpf-pkg -+++ b/tools/build-lpf-pkg -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/usr/bin/bash - - - rm -rf rpms; mkdir rpms -diff --git a/tools/fix-git-setup b/tools/fix-git-setup -index d68c79e..bb2c43f 100755 ---- a/tools/fix-git-setup -+++ b/tools/fix-git-setup -@@ -1,4 +1,4 @@ --#/bin/bash -+#/usr/bin/bash - # - # Setup some version filtering. - # -diff --git a/tools/make_rpm b/tools/make_rpm -index 06ffa35..165c022 100755 ---- a/tools/make_rpm -+++ b/tools/make_rpm -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/usr/bin/bash - # - # lpf: create a fresh rpm to try. - # -diff --git a/tools/version-clean b/tools/version-clean -index 23b3215..26ecf1f 100755 ---- a/tools/version-clean -+++ b/tools/version-clean -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/usr/bin/bash - # - # Version filter, can also be used with file argument. - # -diff --git a/tools/version-smudge b/tools/version-smudge -index eafee44..9fd5ddb 100755 ---- a/tools/version-smudge -+++ b/tools/version-smudge -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/usr/bin/bash - # - # Version filter, can also be used with file argument. - # --- -2.14.4 - diff --git a/lpf.spec b/lpf.spec index 2702147..4bcd17e 100644 --- a/lpf.spec +++ b/lpf.spec @@ -1,26 +1,23 @@ -%global commit f1f5dd90e828ab5ecca7ac9a61dd046014d18738 +%global commit d1cb09f023df6d8cc338184c58dc734ddf325345 %global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global gitdate 20210530 Name: lpf Version: 0.2 -Release: 15.%{shortcommit}%{?dist} +Release: 16.%{gitdate}.%{shortcommit}%{?dist} Summary: Local package factory - build non-redistributable rpms - # Icon from iconarchive.com +# Icon from iconarchive.com License: MIT -URL: https://github.com/leamas/lpf -Source0: %{url}/archive/%{commit}/lpf-%{version}-%{shortcommit}.tar.gz -Patch1: 0001-add-gi.require_version-Gtk-3.0-before-import-Gtk.patch -Patch2: 0002-Fix-lpf-gui-behavior-and-a-strange-message.patch -Patch3: 0003-Fix-appdata.patch -Patch4: 0004-bin-bash-usr-bin-bash.patch +URL: https://github.com/sergiomb2/lpf +Source0: %{url}/archive/%{commit}/lpf-%{version}.%{gitdate}.%{shortcommit}.tar.gz BuildArch: noarch BuildRequires: appdata-tools +BuildRequires: make BuildRequires: desktop-file-utils BuildRequires: python3-devel -BuildRequires: make Requires: hicolor-icon-theme Requires: inotify-tools Requires: polkit @@ -29,9 +26,12 @@ Requires: rpmdevtools Requires: rpm-build Requires: shadow-utils Requires: sudo +Requires: dnf Requires: dnf-plugins-core Requires: zenity Requires(pre): shadow-utils +#for lpf-gui +Requires: python3-gobject-base %description @@ -58,7 +58,7 @@ make DESTDIR=%{buildroot} install desktop-file-validate %{buildroot}%{_datadir}/applications/lpf.desktop %check -appstream-util validate-relax --nonet appdata/lpf.appdata.xml +appstream-util validate-relax --nonet appdata/lpf-gui.appdata.xml %pre @@ -68,9 +68,6 @@ getent passwd pkg-build >/dev/null || \ -c "lpf local package build user" pkg-build exit 0 -%post -/usr/bin/lpf scan || : - %files %doc README.md LICENSE @@ -82,8 +79,7 @@ exit 0 %{_datadir}/applications/lpf-gui.desktop %{_datadir}/applications/lpf-notify.desktop %{_datadir}/icons/hicolor/*/apps/lpf*.png -# No sane owner to depend on. -%{_datadir}/appdata +%{_datadir}/appdata/lpf-gui.appdata.xml %{_datadir}/man/man1/lpf* %{_libexecdir}/lpf-kill-pgroup %attr(440, root, root) %config(noreplace) %{_sysconfdir}/sudoers.d/pkg-build @@ -91,10 +87,13 @@ exit 0 %changelog +* Sun May 30 2021 Sérgio Basto - 0.2-16.20210530.d1cb09f +- Update to lpf-0.2.20210530.d1cb09f + * Tue Jan 26 2021 Fedora Release Engineering - 0.2-15.f1f5dd9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild -* Wed Sep 09 2020 Petr Viktorin - 0.2-14.%{shortcommit} +* Wed Sep 09 2020 Petr Viktorin - 0.2-14.f1f5dd9 - Switch BuildRequires to python3 * Tue Jul 28 2020 Fedora Release Engineering - 0.2-13.f1f5dd9 diff --git a/sources b/sources index 164bde9..5feefa2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c19567edbf2bfdac51522fdb1872e335 lpf-0.2-f1f5dd9.tar.gz +SHA512 (lpf-0.2.20210530.d1cb09f.tar.gz) = bf0039313bf8caca98636b8cc3b2e31e61336721bd1ad0dffb4b850121b84305b2a09a02787883ed77aef903ea870b118873b9872dc437ca549356fd0188fa28