From 6f3c2281f3b1cf8272e61276196d185fc8f082b0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Sun, 8 Dec 2013 22:49:53 +0100 Subject: [PATCH] - up to 1.13 --- rpmorphan-noarch.patch | 63 ++++++++++++++++++++++++++++++++++++++---- rpmorphan.spec | 5 ++-- 2 files changed, 61 insertions(+), 7 deletions(-) diff --git a/rpmorphan-noarch.patch b/rpmorphan-noarch.patch index f86862c..c219764 100644 --- a/rpmorphan-noarch.patch +++ b/rpmorphan-noarch.patch @@ -1,5 +1,14 @@ --- rpmorphan-1.8/Makefile~ 2010-04-30 15:11:55.000000000 +0200 +++ rpmorphan-1.8/Makefile 2010-11-14 11:06:32.686032004 +0100 +@@ -8,7 +8,7 @@ + VERSION=$(shell grep Version rpmorphan.lsm | awk '{print $$2}') + + BINDIR = $(DESTDIR)/usr/bin +-LIBDIR = $(DESTDIR)/usr/lib/rpmorphan/ ++LIBDIR = $(DESTDIR)/usr/share/rpmorphan/ + LOGETC = $(DESTDIR)/etc/ + LOGROT = $(LOGETC)/logrotate.d/ + MANDIR = $(DESTDIR)/usr/share/man @@ -19,7 +19,7 @@ # for keep file DATADIR=$(DESTDIR)/var/lib/rpmorphan @@ -13,10 +22,54 @@ +++ rpmorphan-1.8/rpmorphan.pl 2010-11-14 11:06:06.482032004 +0100 @@ -37,7 +37,7 @@ - # translations - use lib q{.}; # for tests + # library + ## no critic (ProhibitNoisyQuotes) -use lib '/usr/lib/rpmorphan'; # for prod +use lib '/usr/share/rpmorphan'; # for prod - my $lang = $ENV{'LANG'}; - my $locale_dir; - if ( $lang =~ m/fr_FR/ ) { + 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 @@ + + # 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 +@@ -28,7 +28,7 @@ + + # 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/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 @@ + + # 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/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 @@ + + # library + ## no critic (ProhibitNoisyQuotes) +-use lib '/usr/lib/rpmorphan/'; ++use lib '/usr/share/rpmorphan/'; + use lib '.'; + ## no critic (RequireBarewordIncludes) + require 'rpmorphan-lib.pl' diff --git a/rpmorphan.spec b/rpmorphan.spec index 0807176..154facf 100644 --- a/rpmorphan.spec +++ b/rpmorphan.spec @@ -14,12 +14,12 @@ 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.11 +Version: 1.13 Release: 1 License: GPL v2 Group: Applications/System Source0: http://downloads.sourceforge.net/rpmorphan/%{name}-%{version}.tar.gz -# Source0-md5: e81debe57d63d6ec1656272a495f7016 +# Source0-md5: 69840f80398ab94cfb04c1792392346a Patch0: %{name}-noarch.patch URL: http://rpmorphan.sourceforge.net/ BuildRequires: rpm-perlprov @@ -96,6 +96,7 @@ rm -rf $RPM_BUILD_ROOT %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/rpmorphan %attr(755,root,root) %{_bindir}/* %dir %{_datadir}/rpmorphan +%{_datadir}/rpmorphan/rpmorphan*lib.pl %dir %{_datadir}/rpmorphan/locale %{_datadir}/rpmorphan/locale/en %lang(fr) %{_datadir}/rpmorphan/locale/fr_FR -- 2.44.0