[rpmorphan] - Update to 1.12 - Add patch for bug 880603 - spec cleanup

Sat Jul 27 05:21:14 UTC 2013

commit 87c4b73531b6d17287fe488147d80888eab769cd
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Fri Jul 26 23:20:50 2013 -0600

    - Update to 1.12
    - Add patch for bug 880603
    - spec cleanup

 .gitignore                |    1 +
 rpmorphan-bug880603.patch |   12 ++++++++++++
 rpmorphan.spec            |   38 ++++++++++++++++++++++----------------
 sources                   |    2 +-
 4 files changed, 36 insertions(+), 17 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 4ed0e3f..a6004a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 rpmorphan-1.7.tar.gz
 rpmorphan-1.10.tar.gz
 /rpmorphan-1.11.tar.gz
+/rpmorphan-1.12.tar.gz
diff --git a/rpmorphan-bug880603.patch b/rpmorphan-bug880603.patch
new file mode 100644
index 0000000..5a1d600
--- /dev/null
+++ b/rpmorphan-bug880603.patch
@@ -0,0 +1,12 @@
+diff -up rpmorphan-1.12/rpmorphan-lib.pl.bug880603 rpmorphan-1.12/rpmorphan-lib.pl
+--- rpmorphan-1.12/rpmorphan-lib.pl.bug880603	2013-07-26 23:01:08.346389736 -0600
++++ rpmorphan-1.12/rpmorphan-lib.pl	2013-07-26 23:08:18.185770385 -0600
+@@ -89,7 +89,7 @@ sub is_set($$) {
+ 
+ 	#debug("is_set $key");
+ 	my $r_value = $rh_opt->{$key};
+-	return ${$r_value};
++	return $r_value and ${$r_value};
+ }
+ #########################################################
+ sub is_verbose($) {
diff --git a/rpmorphan.spec b/rpmorphan.spec
index 9174fbc..f93625c 100644
--- a/rpmorphan.spec
+++ b/rpmorphan.spec
@@ -1,7 +1,7 @@
 Summary:          List packages that have no dependencies (like deborphan)
 Name:             rpmorphan
-Version:          1.11
-Release:          4%{?dist}
+Version:          1.12
+Release:          1%{?dist}
 Group:            Applications/System
 License:          GPLv2+
 
@@ -9,8 +9,8 @@ BuildArch:        noarch
 
 URL:              http://rpmorphan.sourceforge.net
 Source0:          http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-## rpmorphan.logrotate included in upstream release in 1.11
-#Source1:          rpmorphan.logrotate
+# Patch from bug to fix option handling
+Patch0:           rpmorphan-bug880603.patch
 
 BuildRequires:    /usr/bin/pod2man
 
@@ -45,14 +45,14 @@ have no current maintainer.
 
 %prep
 %setup -q
-sed -i -e "s|/usr/lib|/usr/share|g" rpmorphan.pl
+%patch0 -p1 -b .bug880603
+sed -i -e "s|/usr/lib|/usr/share|g" rpm*
 
 %build
 # Nothing needed here.
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
@@ -61,14 +61,10 @@ mv $RPM_BUILD_ROOT/usr/lib/%{name} $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 
 %files
-%defattr(-,root,root,-)
 %doc rpmorphan.lsm Authors COPYING Changelog NEWS Todo Readme rpmorphanrc.sample
 %{_bindir}/grpmorphan
 %{_bindir}/rpmextra
 %{_bindir}/rpmextra.pl
-%{_bindir}/rpmorphan-curses-lib.pl
-%{_bindir}/rpmorphan-tk-lib.pl
-%{_bindir}/rpmorphan-lib.pl
 %{_bindir}/rpmorphan.pl
 %{_bindir}/rpmorphan
 %{_bindir}/rpmusage.pl
@@ -82,7 +78,7 @@ mv $RPM_BUILD_ROOT/usr/lib/%{name} $RPM_BUILD_ROOT%{_datadir}/%{name}
 %attr(644, root, root)%{_localstatedir}/lib/rpmorphan/keep
 %config(noreplace) %{_sysconfdir}/logrotate.d/rpmorphan
 %{_datadir}/%{name}
-%{_sysconfdir}/rpmorphanrc
+%config(noreplace) %{_sysconfdir}/rpmorphanrc
 %{_mandir}/man1/rpmextra.1*
 %{_mandir}/man1/rpmorphan.1*
 %{_mandir}/man1/rpmusage.1*
@@ -91,6 +87,11 @@ mv $RPM_BUILD_ROOT/usr/lib/%{name} $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 
 %changelog
+* Fri Jul 26 2013 Orion Poplawski <orion at cora.nwra.com> - 1.12-1
+- Update to 1.12
+- Add patch for bug 880603
+- spec cleanup
+
 * Wed Jul 17 2013 Petr Pisar <ppisar at redhat.com> - 1.11-4
 - Perl 5.18 rebuild
 
@@ -166,7 +167,7 @@ mv $RPM_BUILD_ROOT/usr/lib/%{name} $RPM_BUILD_ROOT%{_datadir}/%{name}
 * Mon Jan 05 2009 <gerbier at users.sourceforge.net> 1.4-1
 - improve diagnostic if "rpm -e" return some comments
 
-* Mon Oct 19 2008 <gerbier at users.sourceforge.net> 1.3-1
+* Mon Oct 20 2008 <gerbier at users.sourceforge.net> 1.3-1
 - fix a bug if exclude are set in config file (thanks Szymon Siwek)
 - display number of deleted file
 
@@ -185,7 +186,7 @@ mv $RPM_BUILD_ROOT/usr/lib/%{name} $RPM_BUILD_ROOT%{_datadir}/%{name}
 - (rpmusage) add a default target : all
 - use rpmlint to build a better rpm package
 
-* Wed Apr 27 2007 <gerbier at users.sourceforge.net> 1.0
+* Fri Apr 27 2007 <gerbier at users.sourceforge.net> 1.0
 - fix bug with tk : core dump because update call before mainloop
 - add w_ prefix for widgets variables
 - add dry-run (simulation) mode
@@ -196,7 +197,7 @@ mv $RPM_BUILD_ROOT/usr/lib/%{name} $RPM_BUILD_ROOT%{_datadir}/%{name}
 - (gui) recursive analysis
 - improve virtuals : now check if how many package provide this one
 
-* Wed Mar 29 2007 <gerbier at users.sourceforge.net> 0.9
+* Wed Mar 28 2007 <gerbier at users.sourceforge.net> 0.9
 - add curses interface
 - test for root access before removing packages
 - add optionnal configuration file
@@ -205,16 +206,21 @@ mv $RPM_BUILD_ROOT/usr/lib/%{name} $RPM_BUILD_ROOT%{_datadir}/%{name}
 - add tk_get_current_elem sub
 - add get_from_command_line sub
 - add status widget
+
 * Tue Mar 06 2007 <gerbier at users.sourceforge.net> 0.8
 - add simple graphical user iinterface (optionnal)
 - remove global variable opt_verbose
 - split code in functions : access_time_filter, read_rpm_data, search_orphans
-* Tue Feb 28 2007  <gerbier at users.sourceforge.net> 0.4
+
+* Wed Feb 28 2007  <gerbier at users.sourceforge.net> 0.4
 - add optionnal cache
-* Tue Feb 03 2007  <gerbier at users.sourceforge.net> 0.3
+
+* Sat Feb 03 2007  <gerbier at users.sourceforge.net> 0.3
 - add rpmusage tool
 - add a link from rpmorphan.pl to rpmorphan
+
 * Tue Jan 30 2007  <gerbier at users.sourceforge.net> 0.2
 - add permanent exclude list
+
 * Tue Jan 23 2007  <gerbier at users.sourceforge.net> 0.1
 - Initial spec file 
diff --git a/sources b/sources
index b1496ed..363c116 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e81debe57d63d6ec1656272a495f7016  rpmorphan-1.11.tar.gz
+c42007f6ef54d2ba655f125577edba35  rpmorphan-1.12.tar.gz
