rpms/libapreq2/FC-4 libapreq2-2.07-rc3-ldflags.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 libapreq2.spec, 1.3, 1.4 sources, 1.3, 1.4

[Bojan Smojver (bojan)]

Author: bojan

Update of /cvs/extras/rpms/libapreq2/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7418

Modified Files:
	.cvsignore libapreq2.spec sources 
Added Files:
	libapreq2-2.07-rc3-ldflags.patch 
Log Message:
New stable release, version 2.07.


libapreq2-2.07-rc3-ldflags.patch:

--- NEW FILE libapreq2-2.07-rc3-ldflags.patch ---
--- apreq2-config.in~	2005-04-16 05:19:36.000000000 +0300
+++ apreq2-config.in	2005-12-08 22:27:47.000000000 +0200
@@ -173,8 +173,10 @@
     ;;
     --link-ld)
     if test "$location" = "installed"; then
-        ### avoid using -L if libdir is a "standard" location like /usr/lib
-        flags="$flags -L$libdir -l$APREQ_LIBNAME"
+        if test "$libdir" != "/usr/lib"; then
+            flags="$flags -L$libdir"
+        fi
+        flags="$flags -l$APREQ_LIBNAME"
     else
         flags="$flags -L$thisdir/library/.libs -l$APREQ_LIBNAME"
     fi


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libapreq2/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Jul 2005 06:46:02 -0000	1.3
+++ .cvsignore	13 Feb 2006 02:33:15 -0000	1.4
@@ -1 +1 @@
-libapreq2-2.06-dev.tar.gz
+libapreq2-2.07.tar.gz


Index: libapreq2.spec
===================================================================
RCS file: /cvs/extras/rpms/libapreq2/FC-4/libapreq2.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libapreq2.spec	5 Aug 2005 12:36:13 -0000	1.3
+++ libapreq2.spec	13 Feb 2006 02:33:15 -0000	1.4
@@ -1,16 +1,18 @@
 %{!?apxs: %{expand:%%define apxs %{_sbindir}/apxs}}
 
 Name:           libapreq2
-Version:        2.06
-Release:        2%{?dist}
+Version:        2.07
+Release:        1%{?dist}
 Summary:        Apache HTTP request library
 
 Group:          System Environment/Libraries
 License:        Apache Software License
 URL:            http://httpd.apache.org/apreq/
-Source0:        http://www.cpan.org/authors/id/J/JO/JOESUF/%{name}-%{version}-dev.tar.gz
+#Source0:        http://www.cpan.org/authors/id/J/JO/JOESUF/%{name}-%{version}.tar.gz
+Source0:        http://people.apache.org/~joes/libapreq2-2.07.tar.gz
 Source1:        %{name}-httpd.conf
 Patch0:         %{name}-build.patch
+Patch1:         %{name}-2.07-rc3-ldflags.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  httpd-devel >= 2.0.48
@@ -53,9 +55,22 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}-dev
-aprver=$(apr-config --version)
-apuver=$(apu-config --version)
+%setup -q
+
+# Filter unversioned provides for which there's a versioned one in perl-*:
+cat << \EOF > %{name}-perl-prov
+#!/bin/sh
+%{__perl_provides} $* \
+| grep -v 'perl(APR::\(Request\(::\(Apache2\|CGI\|Error\)\)\?\))$' \
+| grep -v 'perl(Apache2::\(Cookie\|Request\|Upload\))$'
+EOF
+%define __perl_provides %{_builddir}/%{name}-%{version}/%{name}-perl-prov
+chmod +x %{__perl_provides}
+
+# Fix up paths in doc tag files:
+# ap*-1-config in FC5, ap*-config in earlier
+aprver=$(apr-1-config --version || apr-config --version)
+apuver=$(apu-1-config --version || apu-config --version)
 %{__perl} -pi -e \
   "s|<path>.*?</path>|<path>%{_docdir}/%{name}-devel-%{version}/</path>|" \
   docs/apreq2.tag
@@ -65,7 +80,11 @@
 %{__perl} -pi -e \
   "s|<path>.*?</path>|<path>%{_docdir}/apr-util-devel-$apuver/html/</path>|" \
   docs/apu.tag
+
 %patch0
+%patch1
+%{__perl} -pi -e 's|/usr/lib|%{_libdir}|' apreq2-config.in # patch1 ~ multilib
+
 ./buildconf
 
 
@@ -75,7 +94,7 @@
   --disable-static \
   --with-apache2-apxs=%{apxs} \
   --enable-perl-glue \
-  --with-perl-opts=INSTALLDIRS=vendor
+  --with-mm-opts=INSTALLDIRS=vendor
 make %{?_smp_mflags}
 
 
@@ -134,6 +153,28 @@
 
 
 %changelog
+* Mon Feb 13 2006 Bojan Smojver <bojan at rexursive.com> - 2.07-1
+- bring in line with Rawhide (new stable release)
+
+* Fri Feb 03 2006 Bojan Smojver <bojan at rexursive.com> - 2.07-0.2.rc4
+- re-tag for rebuild
+
+* Fri Feb 03 2006 Bojan Smojver <bojan at rexursive.com> - 2.07-0.1.rc4
+- bump up to 2.07-rc4
+
+* Sat Dec 10 2005 Ville Skyttä <ville.skytta at iki.fi> - 2.07-0.2.rc3
+- Filter unversioned perl(*) provides for which a versioned one exists.
+
+* Thu Dec  8 2005 Ville Skyttä <ville.skytta at iki.fi> - 2.07-0.1.rc3
+- Adapt to new apr, httpd.
+- Don't print -L for standard dirs in apreq2-config --link-ld output.
+
+* Sun Oct 16 2005 Ville Skyttä <ville.skytta at iki.fi> - 2.07-0.rc3
+- 2.07-rc3.
+
+* Sat Oct 15 2005 Ville Skyttä <ville.skytta at iki.fi> - 2.07-0.rc2
+- 2.07-rc2.
+
 * Fri Aug  5 2005 Ville Skyttä <ville.skytta at iki.fi> - 2.06-2
 - Include *.tag files in -devel docs, thanks to Bojan Smojver.
 - Remove *.la instead of using %%exclude.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libapreq2/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Jul 2005 06:46:02 -0000	1.3
+++ sources	13 Feb 2006 02:33:15 -0000	1.4
@@ -1 +1 @@
-e245db341c4967e0a23b7f767d6486d9  libapreq2-2.06-dev.tar.gz
+6f2e5e4a14e8b190dead0fe91fc13080  libapreq2-2.07.tar.gz