rpms/libapreq2/devel libapreq2-2.09-version_check.patch, NONE, 1.1 libapreq2.spec, 1.23, 1.24

Bojan Smojver (bojan) fedora-extras-commits at redhat.com
Wed Jan 31 01:34:02 UTC 2007


Author: bojan

Update of /cvs/extras/rpms/libapreq2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7513

Modified Files:
	libapreq2.spec 
Added Files:
	libapreq2-2.09-version_check.patch 
Log Message:
Fix version_check.pl so that we can build the package again.


libapreq2-2.09-version_check.patch:

--- NEW FILE libapreq2-2.09-version_check.patch ---
--- 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;


Index: libapreq2.spec
===================================================================
RCS file: /cvs/extras/rpms/libapreq2/devel/libapreq2.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- libapreq2.spec	9 Nov 2006 19:39:42 -0000	1.23
+++ libapreq2.spec	31 Jan 2007 01:33:31 -0000	1.24
@@ -2,7 +2,7 @@
 
 Name:           libapreq2
 Version:        2.09
-Release:        0.rc2.1%{?dist}
+Release:        0.rc2.2%{?dist}
 Summary:        Apache HTTP request library
 
 Group:          System Environment/Libraries
@@ -12,6 +12,7 @@
 Source1:        %{name}-httpd.conf
 Patch0:         %{name}-build.patch
 Patch1:         %{name}-2.07-rc3-ldflags.patch
+Patch2:         %{name}-2.09-version_check.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  httpd-devel >= 2.0.48
@@ -82,6 +83,7 @@
 
 %patch0
 %patch1
+%patch2
 %{__perl} -pi -e 's|/usr/lib|%{_libdir}|' apreq2-config.in # patch1 ~ multilib
 
 ./buildconf
@@ -153,6 +155,9 @@
 
 
 %changelog
+* Wed Jan 31 2007 Bojan Smojver <bojan at rexursive.com> - 2.09-0.rc2.2
+- fix version_check.pl
+
 * Fri Nov 10 2006 Bojan Smojver <bojan at rexursive.com> - 2.09-0.rc2.1
 - bump up to 2.09-rc2
 




More information about the scm-commits mailing list