|
|
@@ -1,7 +1,7 @@
|
|
|
-Index: URPM-1.43/Makefile.PL
|
|
|
---- URPM-1.43/Makefile.PL.orig 2006-03-13 17:53:51 +0100
|
|
|
-+++ URPM-1.43/Makefile.PL 2006-03-15 22:07:24 +0100
|
|
|
-@@ -3,28 +3,8 @@
|
|
|
+Index: URPM-1.44/Makefile.PL
|
|
|
+--- URPM-1.44/Makefile.PL.orig 2006-06-12 12:20:55 +0200
|
|
|
++++ URPM-1.44/Makefile.PL 2006-06-12 21:21:37 +0200
|
|
|
+@@ -3,46 +3,15 @@
|
|
|
|
|
|
# where to find the rpm utility
|
|
|
|
|
|
@@ -19,6 +19,7 @@ Index: URPM-1.43/Makefile.PL
|
|
|
-defined $rpm_path or die "Can't find rpm on this system\n";
|
|
|
-
|
|
|
-my $version = `LC_ALL=C $rpm_path --version`;
|
|
|
+-chomp $version;
|
|
|
-$version =~ s/RPM version //;
|
|
|
-$version =~ /^(?:4\.[2-9]|[5-9]|\d{2})/
|
|
|
- or die "Unable to build URPM with too old (or undetected) rpm version $version\n";
|
|
|
@@ -27,12 +28,30 @@ Index: URPM-1.43/Makefile.PL
|
|
|
-# directory where to build an rpm of this
|
|
|
-my $rpmtopdir = `$rpm_path --eval '%{_topdir}'`;
|
|
|
-chomp $rpmtopdir;
|
|
|
+-
|
|
|
+-# to generate the ChangeLog depending on the checkout layout
|
|
|
+-my $commonusername = "../common/";
|
|
|
+--d $commonusername or do {
|
|
|
+- $commonusername = "../../common/";
|
|
|
+- -d $commonusername or do {
|
|
|
+- $commonusername = "../../../common/";
|
|
|
+- -d $commonusername or $commonusername = "";
|
|
|
+- };
|
|
|
+-};
|
|
|
+my $rpm_path = "";
|
|
|
+my $rpmtopdir = "";
|
|
|
|
|
|
sub MY::postamble {
|
|
|
<<"**MM**";
|
|
|
-@@ -46,10 +26,7 @@
|
|
|
+ .PHONY: ChangeLog rpmdist srpm rpm
|
|
|
+
|
|
|
+ ChangeLog:
|
|
|
+- LC_ALL=C svn2cl --accum --strip-prefix=soft/rpm/perl-URPM/trunk --authors ${commonusername}username.xml
|
|
|
++ LC_ALL=C svn2cl --accum --strip-prefix=soft/rpm/perl-URPM/trunk --authors username.xml
|
|
|
+ rm -f *.bak
|
|
|
+
|
|
|
+ rpmdist: dist
|
|
|
+@@ -57,13 +26,7 @@
|
|
|
**MM**
|
|
|
}
|
|
|
|
|
|
@@ -40,11 +59,14 @@ Index: URPM-1.43/Makefile.PL
|
|
|
-if ($version =~ /^4\.(4\.[5-9]$|4\.\d\d|[5-9]\.|\d\d)/) {
|
|
|
- $ccflags .= ' -DRPM_CALLBACK_LONGLONG';
|
|
|
-}
|
|
|
+-if ($version eq '4.4.6') {
|
|
|
+- $ccflags .= ' -DRPM_446';
|
|
|
+-}
|
|
|
+my $ccflags = '-fno-strict-aliasing';
|
|
|
|
|
|
WriteMakefile(
|
|
|
NAME => 'URPM',
|
|
|
-@@ -58,8 +35,8 @@
|
|
|
+@@ -72,8 +35,8 @@
|
|
|
},
|
|
|
CCFLAGS => $ccflags,
|
|
|
VERSION_FROM => 'URPM.pm',
|
|
|
@@ -55,9 +77,9 @@ Index: URPM-1.43/Makefile.PL
|
|
|
dist => { COMPRESS => "bzip2", SUFFIX => ".bz2" },
|
|
|
realclean => { FILES => "t/RPMS/noarch/*" },
|
|
|
);
|
|
|
-Index: URPM-1.43/URPM.xs
|
|
|
---- URPM-1.43/URPM.xs.orig 2006-03-13 17:37:43 +0100
|
|
|
-+++ URPM-1.43/URPM.xs 2006-03-15 22:07:16 +0100
|
|
|
+Index: URPM-1.44/URPM.xs
|
|
|
+--- URPM-1.44/URPM.xs.orig 2006-06-12 12:42:25 +0200
|
|
|
++++ URPM-1.44/URPM.xs 2006-06-12 21:21:21 +0200
|
|
|
@@ -22,6 +22,7 @@
|
|
|
#include <fcntl.h>
|
|
|
#include <unistd.h>
|