[libapreq2/el4/master] Revert "Clean up patches."

bojan bojan at fedoraproject.org
Tue Dec 7 02:25:12 UTC 2010


commit bc7689f42e37730bfc8ddaf2b97a331f71809809
Author: Bojan Smojver <bojan at rexursive.com>
Date:   Tue Dec 7 13:24:08 2010 +1100

    Revert "Clean up patches."
    
    This reverts commit e93735567badb80b2a88f22d56a505039afa3b8b.

 libapreq2-2.09-Makefile_PL.patch   |   29 +++++++++++++++++++++++++++++
 libapreq2-2.09-version_check.patch |   11 +++++++++++
 libapreq2-build.patch              |    2 +-
 3 files changed, 41 insertions(+), 1 deletions(-)
---
diff --git a/libapreq2-2.09-Makefile_PL.patch b/libapreq2-2.09-Makefile_PL.patch
new file mode 100644
index 0000000..b08d664
--- /dev/null
+++ b/libapreq2-2.09-Makefile_PL.patch
@@ -0,0 +1,29 @@
+Index: glue/perl/Makefile.PL
+===================================================================
+--- glue/perl/Makefile.PL	(revision 663420)
++++ glue/perl/Makefile.PL	(working copy)
+@@ -64,9 +64,11 @@
+ else {
+     slurp my $config => "$base_dir/config.status";
+     $config =~ /^s,\@APACHE2_INCLUDES\@,([^,]+)/m or
++    $config =~ /^S\["APACHE2_INCLUDES"\]="([^"]+)/m or
+         die "Can't find apache include directory";
+     $apache_includes = $1;
+     $config =~ /^s,\@APR_INCLUDES\@,([^,]+)/m or
++    $config =~ /^S\["APR_INCLUDES"\]="([^"]+)/m or
+         die "Can't find apache include directory";
+     $apache_includes .= " $1";
+ 
+@@ -81,10 +83,12 @@
+     $apr_libs ="";
+ 
+     $config =~ m/^s,\@APREQ_LIBNAME\@,([^,]+)/m or
++    $config =~ m/^S\["APREQ_LIBNAME"\]="([^"]+)/m or
+         die "Can't find apreq libname";
+     $apreq_libname = $1;
+ 
+     $config =~ m/^s,\@PACKAGE_VERSION\@,([^,]+)/m or
++    $config =~ m/^S\["PACKAGE_VERSION"\]="([^"]+)/m or
+         die "Can't find package version";
+     $version = $1;
+ 
diff --git a/libapreq2-2.09-version_check.patch b/libapreq2-2.09-version_check.patch
new file mode 100644
index 0000000..67ecbf8
--- /dev/null
+++ b/libapreq2-2.09-version_check.patch
@@ -0,0 +1,11 @@
+--- build/version_check.pl.orig	2007-01-31 12:27:12.000000000 +1100
++++ build/version_check.pl	2007-01-31 12:25:41.000000000 +1100
+@@ -218,7 +218,7 @@
+ my $saw = $1;
+ my $fail;
+ 
+-if ($saw =~ /^(\d+)(\.(\d+))$/) {
++if ($saw =~ /^(\d+)(\.(\d+))$/ and $version =~ /^(\d+)(\.(\d+))$/) {
+     $fail = $saw < $version;
+ } else {
+     my @version = split /\./, $version;
diff --git a/libapreq2-build.patch b/libapreq2-build.patch
index 24aedbb..96beb5a 100644
--- a/libapreq2-build.patch
+++ b/libapreq2-build.patch
@@ -1,9 +1,9 @@
 --- glue/Makefile.am~	2005-04-16 05:19:36.000000000 +0300
 +++ glue/Makefile.am	2005-05-05 12:14:29.000000000 +0300
 @@ -15,7 +15,7 @@
+ 	cd perl; $(MAKE) test
  
  perl_install:
- 	cd perl; INSTALL=1 @PERL@ @PERL_OPTS@ Makefile.PL -apxs @APACHE2_APXS@ @MM_OPTS@
 -	cd perl; $(MAKE) install
 +	cd perl; $(MAKE) pure_install
  


More information about the scm-commits mailing list