rpms/apr/devel apr.spec,1.70,1.71
Joe Orton (jorton)
fedora-extras-commits at redhat.com
Sun Sep 2 14:15:34 UTC 2007
Author: jorton
Update of /cvs/extras/rpms/apr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20868
Modified Files:
apr.spec
Log Message:
* Sun Sep 2 2007 Joe Orton <jorton at redhat.com> 1.2.9-4
- fix API/ABI of 32-bit builds (#254241)
Index: apr.spec
===================================================================
RCS file: /cvs/extras/rpms/apr/devel/apr.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- apr.spec 31 Aug 2007 21:07:37 -0000 1.70
+++ apr.spec 2 Sep 2007 14:15:02 -0000 1.71
@@ -6,7 +6,7 @@
Summary: Apache Portable Runtime library
Name: apr
Version: 1.2.9
-Release: 3
+Release: 4
License: ASL 2.0
Group: System Environment/Libraries
URL: http://apr.apache.org/
@@ -18,6 +18,7 @@
Patch4: apr-1.2.2-libdir.patch
Patch5: apr-1.2.7-pkgconf.patch
Patch6: apr-1.2.7-psprintfpi.patch
+Patch7: apr-1.2.9-openlfs.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
BuildRequires: autoconf, libtool, e2fsprogs-devel, python
@@ -47,6 +48,7 @@
%patch4 -p1 -b .libdir
%patch5 -p1 -b .pkgconf
%patch6 -p1 -b .psprintfpi
+%patch7 -p1 -b .openlfs
%build
# regenerate configure script etc.
@@ -60,7 +62,6 @@
--includedir=%{_includedir}/apr-%{aprver} \
--with-installbuilddir=%{_libdir}/apr-%{aprver}/build \
--with-devrandom=/dev/urandom
-
make %{?_smp_mflags}
%install
@@ -86,6 +87,15 @@
$RPM_BUILD_ROOT%{_libdir}/libapr-*.a
%check
+%if "%{_lib}" == "lib"
+# Fail if LFS support isn't preent in a 32-bit build, since this
+# breaks ABI and the soname doesn't change: see #254241
+if ! grep off64_t include/apr.h; then
+ cat config.log
+ : LFS support not present in 32-bit build
+ exit 1
+fi
+%endif
%clean
rm -rf $RPM_BUILD_ROOT
@@ -114,7 +124,7 @@
%{_includedir}/apr-%{aprver}/*.h
%changelog
-* Fri Aug 31 2007 Joe Orton <jorton at redhat.com> 1.2.9-3
+* Sun Sep 2 2007 Joe Orton <jorton at redhat.com> 1.2.9-4
- fix API/ABI of 32-bit builds (#254241)
* Tue Aug 21 2007 Joe Orton <jorton at redhat.com> 1.2.9-2
More information about the fedora-extras-commits
mailing list