PATCH: rpm

[Bob Budowniczy]

Witam,

Patche na:
http://lists.pld-linux.org/pipermail/pld-devel-pl/2005-May/128040.html
http://lists.pld-linux.org/pipermail/pld-devel-pl/2005-April/127987.html

Prosze o mail'a jak ktos sie tym zajme, thx.

-- 
best regards
q#
-------------- następna część ---------
Index: rpm-perl_req-INC_dirs.patch
===================================================================
RCS file: /cvsroot/./SOURCES/rpm-perl_req-INC_dirs.patch,v
retrieving revision 1.3
diff -u -r1.3 rpm-perl_req-INC_dirs.patch
--- rpm-perl_req-INC_dirs.patch	23 May 2004 14:49:44 -0000	1.3
+++ rpm-perl_req-INC_dirs.patch	2 May 2005 20:55:09 -0000
@@ -1,6 +1,6 @@
---- scripts/perl.req~	2004-04-16 13:27:10.000000000 +0200
-+++ scripts/perl.req	2004-04-26 23:54:42.128568344 +0200
-@@ -39,8 +39,19 @@
+--- scripts/perl.req~	2005-05-02 22:41:01.000000000 +0200
++++ scripts/perl.req	2005-05-02 22:46:46.000000000 +0200
+@@ -39,9 +39,20 @@
  
  # by Ken Estes Mail.com kestes w staff.mail.com
  
@@ -22,6 +22,7 @@
 +    if (m=/usr/(sbin|bin|lib|lib64|share|X11R6/(lib|lib64|bin))/=) {
        if (! m=(/(doc|man|info|usr/src)/|\.(so|ph|h|html|pod)$)=) {
          process_file($_) if -f;
+       }
 @@ -53,8 +64,9 @@
  }
  delete $require{the}; # don't count "use the sth" as perl module  
@@ -30,6 +31,6 @@
  
 -foreach $module (sort keys %require) {
 +foreach my $module (sort keys %require) {
+   if (length($module) == 0) { next; }
    if (length($require{$module}) == 0) {
       if ($module =~ /^[0-9._]+$/) {
-        print "perl-base >= $module\n";
-------------- następna część ---------
Index: rpm-perl_req.patch
===================================================================
RCS file: /cvsroot/./SOURCES/rpm-perl_req.patch,v
retrieving revision 1.2
diff -u -r1.2 rpm-perl_req.patch
--- rpm-perl_req.patch	12 Jul 2003 20:45:04 -0000	1.2
+++ rpm-perl_req.patch	2 May 2005 20:54:44 -0000
@@ -1,7 +1,10 @@
---- rpm-4.2/scripts/perl.req~	Fri Jul 11 11:54:15 2003
-+++ rpm-4.2/scripts/perl.req	Sat Jul 12 14:48:40 2003
-@@ -57,7 +57,7 @@
+--- rpm-4.2/scripts/perl.req~	2005-05-02 22:01:41.000000000 +0200
++++ rpm-4.2/scripts/perl.req	2005-05-02 22:27:42.000000000 +0200
+@@ -55,9 +55,10 @@
+ 
+ 
  foreach $module (sort keys %require) {
++  if (length($module) == 0) { next; }
    if (length($require{$module}) == 0) {
       if ($module =~ /^[0-9._]+$/) {
 -       print "perl >= $module\n";
@@ -9,7 +12,7 @@
       } else {
           print "perl($module)\n";
       }
-@@ -243,11 +243,11 @@
+@@ -253,11 +254,11 @@
        # to mean that a particular version of perl is specified
  
        if ($module =~ /5.00/) {
-------------- następna część ---------
Index: rpm.macros
===================================================================
RCS file: /cvsroot/./SOURCES/rpm.macros,v
retrieving revision 1.158.4.37
diff -u -r1.158.4.37 rpm.macros
--- rpm.macros	1 May 2005 10:42:27 -0000	1.158.4.37
+++ rpm.macros	2 May 2005 20:54:10 -0000
@@ -463,21 +463,21 @@
 
 # Python specific macro definitions.
 # python main version
-%py_ver         %(echo `python -c "import sys; print sys.version[:3]"`)
+%py_ver		%([ -e %{__python} ] && echo `%{__python} -c "import sys; print sys.version[:3]"`)
 
 # directories
-%py_prefix      %(echo `python -c "import sys; print sys.prefix"`)
-%py_libdir      %{py_prefix}/%{_lib}/python%{py_ver}
+%py_prefix	%([ -e %{__python} ] && echo `%{__python} -c "import sys; print sys.prefix"`)
+%py_libdir	%{py_prefix}/%{_lib}/python%{py_ver}
 %py_scriptdir	%{py_prefix}/share/python%{py_ver}
-%py_incdir      /usr/include/python%{py_ver}
+%py_incdir	/usr/include/python%{py_ver}
 %py_sitedir	%{py_libdir}/site-packages
 %py_sitescriptdir %{py_scriptdir}/site-packages
-%py_dyndir      %{py_libdir}/lib-dynload
+%py_dyndir	%{py_libdir}/lib-dynload
 
 # pure python modules compilation
-%py_comp        python -c "import compileall; import sys; compileall.compile_dir(sys.argv[1], ddir=sys.argv[1][len('$RPM_BUILD_ROOT'):])"
+%py_comp	%{__python} -c "import compileall; import sys; compileall.compile_dir(sys.argv[1], ddir=sys.argv[1][len('$RPM_BUILD_ROOT'):])"
 
-%py_ocomp       python -O -c "import compileall; import sys; compileall.compile_dir(sys.argv[1], ddir=sys.argv[1][len('$RPM_BUILD_ROOT'):])"
+%py_ocomp	%{__python} -O -c "import compileall; import sys; compileall.compile_dir(sys.argv[1], ddir=sys.argv[1][len('$RPM_BUILD_ROOT'):])"
 
 # Software written in Python language require Python with main version
 %pyrequires_eq() Requires:	python(bytecode) = %py_ver %1