rpms/apr/devel apr.spec,1.72,1.73

[Joe Orton (jorton)]

Author: jorton

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

Modified Files:
	apr.spec 
Log Message:
* Tue Sep 18 2007 Joe Orton <jorton at redhat.com> 1.2.11-2
- fix %check for non-multilib 64-bit platforms



Index: apr.spec
===================================================================
RCS file: /cvs/extras/rpms/apr/devel/apr.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- apr.spec	11 Sep 2007 09:50:48 -0000	1.72
+++ apr.spec	18 Sep 2007 11:00:19 -0000	1.73
@@ -6,7 +6,7 @@
 Summary: Apache Portable Runtime library
 Name: apr
 Version: 1.2.11
-Release: 1
+Release: 2
 License: ASL 2.0
 Group: System Environment/Libraries
 URL: http://apr.apache.org/
@@ -85,15 +85,14 @@
       $RPM_BUILD_ROOT%{_libdir}/libapr-*.a
 
 %check
-%if "%{_lib}" == "lib"
-# Fail if LFS support isn't preent in a 32-bit build, since this
+# Fail if LFS support isn't present 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
+if grep 'define SIZEOF_VOIDP 4' include/apr.h \
+   && ! 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
@@ -122,6 +121,9 @@
 %{_includedir}/apr-%{aprver}/*.h
 
 %changelog
+* Tue Sep 18 2007 Joe Orton <jorton at redhat.com> 1.2.11-2
+- fix %%check for non-multilib 64-bit platforms
+
 * Sun Sep  9 2007 Bojan Smojver <bojan at rexursive.com> 1.2.11-1
 - bump up to 1.2.11
 - drop openlfs patch (fixed upstream)