From 7052568968a0cc03b1c79b82ea7c91bff0244216 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Thu, 8 Apr 2021 10:07:43 +0200 Subject: [PATCH] - up to 1.19 --- rpmorphan-noarch.patch | 94 ++++++++++++++++++++++-------------------- rpmorphan.spec | 17 ++++++-- 2 files changed, 64 insertions(+), 47 deletions(-) diff --git a/rpmorphan-noarch.patch b/rpmorphan-noarch.patch index c219764..6dab9f0 100644 --- a/rpmorphan-noarch.patch +++ b/rpmorphan-noarch.patch @@ -1,7 +1,8 @@ ---- rpmorphan-1.8/Makefile~ 2010-04-30 15:11:55.000000000 +0200 -+++ rpmorphan-1.8/Makefile 2010-11-14 11:06:32.686032004 +0100 +diff -ur rpmorphan-1.19.orig/Makefile rpmorphan-1.19/Makefile +--- rpmorphan-1.19.orig/Makefile 2018-09-14 17:45:29.000000000 +0200 ++++ rpmorphan-1.19/Makefile 2021-04-08 10:03:49.757653188 +0200 @@ -8,7 +8,7 @@ - VERSION=$(shell grep Version rpmorphan.lsm | awk '{print $$2}') + VERSION = $(shell grep Version rpmorphan.lsm | awk '{print $$2}') BINDIR = $(DESTDIR)/usr/bin -LIBDIR = $(DESTDIR)/usr/lib/rpmorphan/ @@ -11,65 +12,70 @@ MANDIR = $(DESTDIR)/usr/share/man @@ -19,7 +19,7 @@ # for keep file - DATADIR=$(DESTDIR)/var/lib/rpmorphan + DATADIR = $(DESTDIR)/var/lib/rpmorphan # locales --TARGET_LOCALE=$(DESTDIR)/usr/lib/rpmorphan/locale -+TARGET_LOCALE=$(DESTDIR)/usr/share/rpmorphan/locale +-TARGET_LOCALE = $(DESTDIR)/usr/lib/rpmorphan/locale ++TARGET_LOCALE = $(DESTDIR)/usr/share/rpmorphan/locale # log - LOGDIR=$(DESTDIR)/var/log ---- rpmorphan-1.8/rpmorphan.pl~ 2010-04-30 15:38:55.000000000 +0200 -+++ rpmorphan-1.8/rpmorphan.pl 2010-11-14 11:06:06.482032004 +0100 -@@ -37,7 +37,7 @@ + LOGDIR = $(DESTDIR)/var/log +diff -ur rpmorphan-1.19.orig/rpmdep.pl rpmorphan-1.19/rpmdep.pl +--- rpmorphan-1.19.orig/rpmdep.pl 2018-09-14 17:45:29.000000000 +0200 ++++ rpmorphan-1.19/rpmdep.pl 2021-04-08 10:03:49.757653188 +0200 +@@ -30,7 +30,7 @@ # library - ## no critic (ProhibitNoisyQuotes) --use lib '/usr/lib/rpmorphan'; # for prod -+use lib '/usr/share/rpmorphan'; # for prod - use lib q{.}; # for tests - ## no critic (RequireBarewordIncludes) - require 'rpmorphan-lib.pl' ---- rpmorphan-1.13/rpmdep.pl~ 2013-12-06 15:44:21.000000000 +0100 -+++ rpmorphan-1.13/rpmdep.pl 2013-12-08 22:47:30.521794647 +0100 -@@ -29,7 +29,7 @@ + push @INC, dirname($PROGRAM_NAME); # dev, tgz +-push @INC, '/usr/lib/rpmorphan/'; # prod rpm ++push @INC, '/usr/share/rpmorphan/'; # prod rpm - # library - ## no critic (ProhibitNoisyQuotes) --use lib '/usr/lib/rpmorphan/'; -+use lib '/usr/share/rpmorphan/'; - use lib '.'; ## no critic (RequireBarewordIncludes) require 'rpmorphan-lib.pl' ---- rpmorphan-1.13/rpmduplicates.pl~ 2013-12-06 15:44:21.000000000 +0100 -+++ rpmorphan-1.13/rpmduplicates.pl 2013-12-08 22:47:40.988461238 +0100 +diff -ur rpmorphan-1.19.orig/rpmduplicates.pl rpmorphan-1.19/rpmduplicates.pl +--- rpmorphan-1.19.orig/rpmduplicates.pl 2018-09-14 17:45:29.000000000 +0200 ++++ rpmorphan-1.19/rpmduplicates.pl 2021-04-08 10:03:49.757653188 +0200 @@ -28,7 +28,7 @@ + use File::Basename; + + ## library is not necessary in current code +-#use lib '/usr/lib/rpmorphan/'; ++#use lib '/usr/share/rpmorphan/'; + #push @INC, dirname($PROGRAM_NAME); + # + ### no critic (RequireBarewordIncludes) +diff -ur rpmorphan-1.19.orig/rpmextra.pl rpmorphan-1.19/rpmextra.pl +--- rpmorphan-1.19.orig/rpmextra.pl 2018-09-14 17:45:29.000000000 +0200 ++++ rpmorphan-1.19/rpmextra.pl 2021-04-08 10:03:49.757653188 +0200 +@@ -31,7 +31,7 @@ # library - ## no critic (ProhibitNoisyQuotes) --use lib '/usr/lib/rpmorphan/'; -+use lib '/usr/share/rpmorphan/'; - use lib '.'; + push @INC, dirname($PROGRAM_NAME); # dev, tgz +-push @INC, '/usr/lib/rpmorphan/'; # prod rpm ++push @INC, '/usr/share/rpmorphan/'; # prod rpm + ## no critic (RequireBarewordIncludes) require 'rpmorphan-lib.pl' ---- rpmorphan-1.13/rpmextra.pl~ 2013-12-06 15:44:21.000000000 +0100 -+++ rpmorphan-1.13/rpmextra.pl 2013-12-08 22:47:50.961794499 +0100 -@@ -30,7 +30,7 @@ +diff -ur rpmorphan-1.19.orig/rpmorphan.pl rpmorphan-1.19/rpmorphan.pl +--- rpmorphan-1.19.orig/rpmorphan.pl 2018-09-14 17:45:29.000000000 +0200 ++++ rpmorphan-1.19/rpmorphan.pl 2021-04-08 10:03:49.757653188 +0200 +@@ -29,7 +29,7 @@ # library - ## no critic (ProhibitNoisyQuotes) --use lib '/usr/lib/rpmorphan/'; -+use lib '/usr/share/rpmorphan/'; - use lib '.'; + push @INC, dirname($PROGRAM_NAME); # dev, tgz +-push @INC, '/usr/lib/rpmorphan/'; # prod rpm ++push @INC, '/usr/share/rpmorphan/'; # prod rpm + ## no critic (RequireBarewordIncludes) require 'rpmorphan-lib.pl' ---- rpmorphan-1.13/rpmusage.pl~ 2013-12-06 15:44:21.000000000 +0100 -+++ rpmorphan-1.13/rpmusage.pl 2013-12-08 22:48:07.715127711 +0100 -@@ -27,7 +27,7 @@ +diff -ur rpmorphan-1.19.orig/rpmusage.pl rpmorphan-1.19/rpmusage.pl +--- rpmorphan-1.19.orig/rpmusage.pl 2018-09-14 17:45:29.000000000 +0200 ++++ rpmorphan-1.19/rpmusage.pl 2021-04-08 10:03:49.757653188 +0200 +@@ -28,7 +28,7 @@ # library - ## no critic (ProhibitNoisyQuotes) --use lib '/usr/lib/rpmorphan/'; -+use lib '/usr/share/rpmorphan/'; - use lib '.'; + push @INC, dirname($PROGRAM_NAME); # dev, tgz +-push @INC, '/usr/lib/rpmorphan/'; # prod rpm ++push @INC, '/usr/share/rpmorphan/'; # prod rpm + ## no critic (RequireBarewordIncludes) require 'rpmorphan-lib.pl' diff --git a/rpmorphan.spec b/rpmorphan.spec index deff888..42c92a7 100644 --- a/rpmorphan.spec +++ b/rpmorphan.spec @@ -13,18 +13,19 @@ Summary: rpmorphan - list the orphaned rpm packages Summary(fr.UTF-8): rpmorphan liste les packages rpm orphelins Summary(pl.UTF-8): rpmorphan - wyświetlanie listy osieroconych pakietów Name: rpmorphan -Version: 1.13 -Release: 2 +Version: 1.19 +Release: 1 License: GPL v2 Group: Applications/System Source0: http://downloads.sourceforge.net/rpmorphan/%{name}-%{version}.tar.gz -# Source0-md5: 69840f80398ab94cfb04c1792392346a +# Source0-md5: b526c13092073701e1625cd608b1ba76 Patch0: %{name}-noarch.patch URL: http://rpmorphan.sourceforge.net/ BuildRequires: rpm-perlprov Requires: perl-Encode Suggests: perl-Curses-UI Suggests: perl-Tk +Suggests: perl-Tk-MListbox BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -77,6 +78,16 @@ Dostarcza dodatkowo narzędzia: %setup -q %patch0 -p1 +%{__sed} -E -i -e '1s,#!\s*/usr/bin/env\s+perl(\s|$),#!%{__perl}\1,' \ + rpmdep.pl \ + rpmduplicates.pl \ + rpmextra.pl \ + rpmorphan-curses-lib.pl \ + rpmorphan-lib.pl \ + rpmorphan-tk-lib.pl \ + rpmorphan.pl \ + rpmusage.pl + %install rm -rf $RPM_BUILD_ROOT %{__make} install \ -- 2.44.0