rpms/apr-util
5
0
Fork 0
Code Issues Pull Requests Releases Activity

- update to 1.2.7

Browse Source 
- use pkg-config in apu-1-config to make it libdir-agnostic
This commit is contained in:
jorton 2006-05-02 10:52:38 +00:00
parent 3906092d30
commit 8ebc105639
5 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -1 +1 @@
apr-util-0.9.7.tar.gz apr-util-1.2.7.tar.gz

25
apr-util-1.2.7-pkgconf.patch Normal file
View File

@ -0,0 +1,25 @@
--- apr-util-1.2.7/Makefile.in.pkgconf
+++ apr-util-1.2.7/Makefile.in
@@ -51,7 +51,7 @@
# Create apu-config script suitable for the install tree
apu-config.out: $(APU_CONFIG)
- sed 's,^\(location=\).*$$,\1installed,' < $(APU_CONFIG) > $@
+ sed 's,^\(location=\).*$$,\1installed,;s,^\(APR_.*_DIR\)=.*,\1="$${libdir}/build",' < $(APU_CONFIG) > $@
install: $(TARGET_LIB) apu-config.out
$(APR_MKDIR) $(DESTDIR)$(includedir) $(DESTDIR)$(libdir)/pkgconfig \
--- apr-util-1.2.7/apu-config.in.pkgconf
+++ apr-util-1.2.7/apu-config.in
@@ -24,9 +24,10 @@
prefix="@prefix@"
exec_prefix="@exec_prefix@"
bindir="@bindir@"
-libdir="@libdir@"
includedir="@includedir@"
+libdir=`pkg-config --variable=libdir apr-util-@APRUTIL_MAJOR_VERSION@`
+
LIBS="@APRUTIL_EXPORT_LIBS@"
INCLUDES="@APRUTIL_INCLUDES@"
LDFLAGS="@APRUTIL_LDFLAGS@"

10
apr-util.spec
View File

@ -3,7 +3,7 @@
Summary: Apache Portable Runtime Utility library Summary: Apache Portable Runtime Utility library
Name: apr-util Name: apr-util
Version: 1.2.6 Version: 1.2.7
Release: 2 Release: 2
License: Apache Software License 2.0 License: Apache Software License 2.0
Group: System Environment/Libraries Group: System Environment/Libraries
@ -11,6 +11,7 @@ URL: http://apr.apache.org/
Source0: %{name}-%{version}.tar.gz Source0: %{name}-%{version}.tar.gz
Patch0: apr-util-1.2.2-exports.patch Patch0: apr-util-1.2.2-exports.patch
Patch1: apr-util-1.2.6-ldap.patch Patch1: apr-util-1.2.6-ldap.patch
Patch2: apr-util-1.2.7-pkgconf.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
BuildRequires: autoconf, doxygen, apr-devel >= 1.2.0 BuildRequires: autoconf, doxygen, apr-devel >= 1.2.0
BuildRequires: openldap-devel, db4-devel, expat-devel BuildRequires: openldap-devel, db4-devel, expat-devel
@ -27,7 +28,7 @@ for XML, LDAP, database interfaces, URI parsing and more.
%package devel %package devel
Group: Development/Libraries Group: Development/Libraries
Summary: APR utility library development kit Summary: APR utility library development kit
Requires: apr-util = %{version}-%{release}, apr-devel Requires: apr-util = %{version}-%{release}, apr-devel, pkgconfig
Requires: openldap-devel, db4-devel, expat-devel Requires: openldap-devel, db4-devel, expat-devel
Conflicts: subversion-devel < 0.20.1-2 Conflicts: subversion-devel < 0.20.1-2
@ -41,6 +42,7 @@ library of C data structures and routines.
%setup -q %setup -q
%patch0 -p1 -b .exports %patch0 -p1 -b .exports
%patch1 -p1 -b .ldap %patch1 -p1 -b .ldap
%patch2 -p1 -b .pkgconf
%build %build
autoheader && autoconf autoheader && autoconf
@ -104,6 +106,10 @@ rm -rf $RPM_BUILD_ROOT
%doc --parents html %doc --parents html
%changelog %changelog
* Tue May 2 2006 Joe Orton <jorton@redhat.com> 1.2.7-2
- update to 1.2.7
- use pkg-config in apu-1-config to make it libdir-agnostic
* Thu Apr 6 2006 Joe Orton <jorton@redhat.com> 1.2.6-2 * Thu Apr 6 2006 Joe Orton <jorton@redhat.com> 1.2.6-2
- update to 1.2.6 - update to 1.2.6
- define LDAP_DEPRECATED in apr_ldap.h (r391985, #188073) - define LDAP_DEPRECATED in apr_ldap.h (r391985, #188073)

2
sources
View File

@ -1 +1 @@
f8f17dd6bd17926ab2b03767f1f3a1fc apr-util-1.2.6.tar.gz c3702668a640be1695956115857ec22e apr-util-1.2.7.tar.gz

2
upstream
View File

@ -1 +1 @@
apr-util-1.2.6.tar.gz apr-util-1.2.7.tar.gz