rpms/rpmrebuild/devel .cvsignore, 1.2, 1.3 rpmrebuild.spec, 1.1, 1.2 sources, 1.2, 1.3

Mon Apr 7 13:22:42 UTC 2008

Author: afsilva

Update of /cvs/pkgs/rpms/rpmrebuild/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24350

Modified Files:
	.cvsignore rpmrebuild.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rpmrebuild/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

--- .cvsignore	8 Oct 2007 13:56:16 -0000	1.2
+++ .cvsignore	7 Apr 2008 13:22:01 -0000	1.3
@@ -1 +1 @@
-rpmrebuild-2.1.1.tar.gz
+rpmrebuild-2.2.1.tar.gz


Index: rpmrebuild.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpmrebuild/devel/rpmrebuild.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rpmrebuild.spec	8 Oct 2007 13:56:16 -0000	1.1
+++ rpmrebuild.spec	7 Apr 2008 13:22:01 -0000	1.2
@@ -1,21 +1,18 @@
 Name:           rpmrebuild
-Version:        2.1.1
-Release:        9%{?dist}
+Version:        2.2.1
+Release:        1%{?dist}
 Summary:        A tool to build rpm file from rpm database
 
 Group:          Development/Tools
 License:        GPLv2+
 URL:            http://rpmrebuild.sourceforge.net
 
-# The tarball was extracted from the upstream src.rpm located at:
-# http://downloads.sourceforge.net/rpmrebuild/%{name}-%{version}-1rpm4.src.rpm
-
 Source0:        http://downloads.sourceforge.net/rpmrebuild/%{name}-%{version}.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-Requires:       rpm >= 4.0, grep, rpm-build
+Requires:       rpm >= 4.0, grep, rpm-build, bash, cpio, textutils
 
 %description
 A tool to build an RPM file from a package that has already been installed.
@@ -32,11 +29,22 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 rm -f $RPM_BUILD_ROOT%{_prefix}/lib/rpmrebuild/VERSION
+
+#fix for .src without shebangs
 chmod a+w $RPM_BUILD_ROOT%{_prefix}/lib/rpmrebuild/rpmrebuild_parser.src
 awk '{if (NR==1) print "#!/bin/bash\n" $0; else print $0;}' < $RPM_BUILD_ROOT%{_prefix}/lib/rpmrebuild/rpmrebuild_parser.src > $RPM_BUILD_ROOT%{_prefix}/lib/rpmrebuild/rpmrebuild_parser.src.new
 mv $RPM_BUILD_ROOT%{_prefix}/lib/rpmrebuild/rpmrebuild_parser.src.new $RPM_BUILD_ROOT%{_prefix}/lib/rpmrebuild/rpmrebuild_parser.src
 chmod a-w $RPM_BUILD_ROOT%{_prefix}/lib/rpmrebuild/rpmrebuild_parser.src
 
+#remove non-UTF8 man files
+rm -f $RPM_BUILD_ROOT%{_mandir}/fr_FR/man1/{demo,nodoc,file2pacDep,set_tag,uniq}.plug.1rrp.gz
+rm -f $RPM_BUILD_ROOT%{_mandir}/fr_FR/man1/rpmrebuild{,_plugins}.1.gz
+rm -rf $RPM_BUILD_ROOT%{_mandir}/fr_FR/man1/
+
+#move UTF8 man files to the correct location
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/fr/man1/
+mv $RPM_BUILD_ROOT%{_mandir}/fr_FR.UTF-8/man1/*  $RPM_BUILD_ROOT%{_mandir}/fr/man1/
+rm -rf $RPM_BUILD_ROOT%{_mandir}/fr_FR.UTF-8/man1/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -50,42 +58,78 @@
   sed -i -e '/RPMREBUILD START/,/RPMREBUILD END/d' %{_sysconfdir}/popt
 fi
 
+%triggerin -- rpm
+########################################
+# This code should remove all lines from
+# the line contains 'RPMREBUILD START'
+# till (include) line 'RPMREBUILD END'
+# in the file /etc/popt
+########################################
+
+POPT=/etc/popt
+
+if [ -f $POPT ]; then
+   sed -i -e '/RPMREBUILD START/,/RPMREBUILD END/d' $POPT
+fi
+cat /usr/lib/rpmrebuild/popt-with-POPTdesc >> /etc/popt || exit
+
+
 %files
 %defattr(-,root,root,-)
 %doc VERSION AUTHORS Changelog COPYING COPYRIGHT News Todo README
 %dir %{_prefix}/lib/rpmrebuild/
 %dir %{_prefix}/lib/rpmrebuild/plugins/
-%attr(0755,root,root) %{_prefix}/lib/rpmrebuild/plugins/demo.sh
-%attr(0755,root,root) %{_prefix}/lib/rpmrebuild/plugins/demofiles.sh
-%attr(0755,root,root) %{_prefix}/lib/rpmrebuild/plugins/file2pacDep.sh
-%attr(0755,root,root) %{_prefix}/lib/rpmrebuild/plugins/uniq.sh
-%attr(0755,root,root) %{_prefix}/lib/rpmrebuild/rpmrebuild_buildroot.sh
-%attr(0755,root,root) %{_prefix}/lib/rpmrebuild/rpmrebuild_files.sh
-%attr(0755,root,root) %{_prefix}/lib/rpmrebuild/rpmrebuild_ghost.sh
-%attr(0755,root,root) %{_prefix}/lib/rpmrebuild/run.sh
-%attr(0755,root,root) %{_bindir}/rpmrebuild
+%attr(0755,root,root) %{_prefix}/bin/rpmrebuild
 %attr(0755,root,root) %{_prefix}/lib/rpmrebuild/plugins/nodoc.sh
-%attr(0755,root,root) %{_prefix}/lib/rpmrebuild/processing_func.src
 %attr(0755,root,root) %{_prefix}/lib/rpmrebuild/rpmrebuild_parser.src
+%attr(0755,root,root) %{_prefix}/lib/rpmrebuild/processing_func.src
+%attr(0755,root,root) %{_prefix}/lib/rpmrebuild/rpmrebuild_buildroot.sh
+%attr(0755,root,root) %{_prefix}/lib/rpmrebuild/run.sh
 %attr(0755,root,root) %{_prefix}/lib/rpmrebuild/spec_func.src
 %attr(0755,root,root) %{_prefix}/lib/rpmrebuild/rpmrebuild.sh
+%attr(0755,root,root) %{_prefix}/lib/rpmrebuild/plugins/uniq.sh
+%attr(0755,root,root) %{_prefix}/lib/rpmrebuild/plugins/demo.sh
+%attr(0755,root,root) %{_prefix}/lib/rpmrebuild/plugins/set_tag.sh
+%attr(0755,root,root) %{_prefix}/lib/rpmrebuild/plugins/file2pacDep.sh
+%attr(0755,root,root) %{_prefix}/lib/rpmrebuild/plugins/demofiles.sh
+%attr(0755,root,root) %{_prefix}/lib/rpmrebuild/rpmrebuild_ghost.sh
+%attr(0755,root,root) %{_prefix}/lib/rpmrebuild/rpmrebuild_files.sh
 %{_prefix}/lib/rpmrebuild/.popt
+%{_prefix}/lib/rpmrebuild/plugins/set_tag.plug
+%{_prefix}/lib/rpmrebuild/plugins/nodoc.plug
 %{_prefix}/lib/rpmrebuild/plugins/demo.plug
 %{_prefix}/lib/rpmrebuild/plugins/file2pacDep.plug
-%{_prefix}/lib/rpmrebuild/plugins/nodoc.plug
 %{_prefix}/lib/rpmrebuild/plugins/uniq.plug
+%{_prefix}/lib/rpmrebuild/plugins/demofiles.plug
 %{_prefix}/lib/rpmrebuild/popt-with-POPTdesc
 %{_prefix}/lib/rpmrebuild/popt-without-POPTdesc
 %{_prefix}/lib/rpmrebuild/rpmrebuild_popt
+%{_prefix}/lib/rpmrebuild/locale/en/rpmrebuild.lang
+%{_prefix}/lib/rpmrebuild/locale/fr_FR.UTF-8/rpmrebuild.lang
+%{_prefix}/lib/rpmrebuild/locale/fr_FR/rpmrebuild.lang
 %{_mandir}/man1/demo.plug.1rrp.gz
 %{_mandir}/man1/file2pacDep.plug.1rrp.gz
 %{_mandir}/man1/nodoc.plug.1rrp.gz
 %{_mandir}/man1/rpmrebuild.1.gz
 %{_mandir}/man1/rpmrebuild_plugins.1.gz
 %{_mandir}/man1/uniq.plug.1rrp.gz
-
+%{_mandir}/fr/man1/demo.plug.1rrp.gz
+%{_mandir}/fr/man1/demofiles.plug.1rrp.gz
+%{_mandir}/fr/man1/file2pacDep.plug.1rrp.gz
+%{_mandir}/fr/man1/nodoc.plug.1rrp.gz
+%{_mandir}/fr/man1/rpmrebuild.1.gz
+%{_mandir}/fr/man1/rpmrebuild_plugins.1.gz
+%{_mandir}/fr/man1/set_tag.plug.1rrp.gz
+%{_mandir}/fr/man1/uniq.plug.1rrp.gz
+%{_mandir}/man1/demofiles.plug.1rrp.gz
+%{_mandir}/man1/set_tag.plug.1rrp.gz
 
 %changelog
+* Fri Apr 04 2008 Anderson Silva <ansilva at redhat.com> 2.2.1-1
+- New package from upstream.
+- Fixed French man files to UTF8 into %%{_mandir}/fr/ directory
+- Added some more basic dependencies
+- Created a %%triggerin to allow rpmrebuild be used as a parameter for rpm
 * Fri Sep 28 2007 Anderson Silva <ansilva at redhat.com> 2.1.1-9
 - Simpler %%postun provided by Mamoru Tasaka. Thanks.
 * Fri Sep 28 2007 Anderson Silva <ansilva at redhat.com> 2.1.1-8


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rpmrebuild/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Oct 2007 13:56:16 -0000	1.2
+++ sources	7 Apr 2008 13:22:01 -0000	1.3
@@ -1 +1 @@
-d460a146cff12ec5b2723230b7a455b2  rpmrebuild-2.1.1.tar.gz
+3efc21883f7a5d7b853022ea2fd697de  rpmrebuild-2.2.1.tar.gz


