rpms/libapreq2/devel libapreq2-2.07-rc3-ldflags.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 libapreq2.spec, 1.4, 1.5 sources, 1.4, 1.5

Ville Skytta (scop) fedora-extras-commits at redhat.com
Thu Dec 8 20:32:14 UTC 2005


Author: scop

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

Modified Files:
	.cvsignore libapreq2.spec sources 
Added Files:
	libapreq2-2.07-rc3-ldflags.patch 
Log Message:
* 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.


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/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	15 Oct 2005 09:10:07 -0000	1.4
+++ .cvsignore	8 Dec 2005 20:32:12 -0000	1.5
@@ -1 +1 @@
-libapreq2-2.07-rc2.tar.gz
+libapreq2-2.07-rc3.tar.gz


Index: libapreq2.spec
===================================================================
RCS file: /cvs/extras/rpms/libapreq2/devel/libapreq2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libapreq2.spec	15 Oct 2005 09:10:07 -0000	1.4
+++ libapreq2.spec	8 Dec 2005 20:32:12 -0000	1.5
@@ -2,16 +2,17 @@
 
 Name:           libapreq2
 Version:        2.07
-Release:        0.rc2%{?dist}
+Release:        0.1.rc3%{?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}.tar.gz
-Source0:        http://people.apache.org/~joes/libapreq2-2.07-rc2.tar.gz
+Source0:        http://people.apache.org/~joes/libapreq2-2.07-rc3.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
@@ -55,8 +56,9 @@
 
 %prep
 %setup -q
-aprver=$(apr-config --version)
-apuver=$(apu-config --version)
+# 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
@@ -67,7 +69,8 @@
   "s|<path>.*?</path>|<path>%{_docdir}/apr-util-devel-$apuver/html/</path>|" \
   docs/apu.tag
 %patch0
-rm glue/perl/pm_to_blib
+%patch1
+%{__perl} -pi -e 's|/usr/lib|%{_libdir}|' apreq2-config.in # patch1 ~ multilib
 ./buildconf
 
 
@@ -136,6 +139,13 @@
 
 
 %changelog
+* 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.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libapreq2/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	15 Oct 2005 09:10:07 -0000	1.4
+++ sources	8 Dec 2005 20:32:12 -0000	1.5
@@ -1 +1 @@
-58126a3682617e65a5ce18ca542fd797  libapreq2-2.07-rc2.tar.gz
+3dcccf0afb7a5315e3d8115041893ee4  libapreq2-2.07-rc3.tar.gz




More information about the scm-commits mailing list