- add multilib fixes for neon-config (#192734)

.cvsignore

@@ -1,2 +1 @@
-neon-0.25.5.tar.gz
-i386
+neon-0.26.0.tar.gz

neon-0.25.5-multilib.patch

@@ -0,0 +1,56 @@
+--- neon-0.25.5/neon.pc.in.multilib
++++ neon-0.25.5/neon.pc.in
+@@ -2,6 +2,7 @@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+ includedir=@includedir@
++has_lfs=@NE_FLAG_LFS@
+ 
+ Name: neon
+ Description: HTTP/WebDAV client library
+--- neon-0.25.5/neon-config.in.multilib
++++ neon-0.25.5/neon-config.in
+@@ -5,7 +5,11 @@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ includedir=@includedir@
+-libdir=@libdir@
++
++libdir=`pkg-config --variable=libdir neon`
++CFLAGS=`pkg-config --cflags neon`
++LIBS=`pkg-config --libs neon`
++has_lfs=`pkg-config --variable=has_lfs neon`
+ 
+ usage()
+ {
+@@ -21,7 +25,7 @@
+   --help		display this help and exit
+   --version		output version information
+   --support FEATURE     exit with success if feature is supported
+- Known features: dav [@NE_FLAG_DAV@], ssl [@NE_FLAG_SSL@], zlib [@NE_FLAG_ZLIB@], ipv6 [@NE_FLAG_IPV6@], lfs [@NE_FLAG_LFS@]
++ Known features: dav [@NE_FLAG_DAV@], ssl [@NE_FLAG_SSL@], zlib [@NE_FLAG_ZLIB@], ipv6 [@NE_FLAG_IPV6@], lfs [${has_lfs}]
+ 
+ EOF
+ 
+@@ -66,11 +70,10 @@
+ 	;;
+ 
+     --cflags)
+-       	echo -I${includedir}/neon @NEON_CFLAGS@
++       	echo ${CFLAGS}
+        	;;
+ 
+     --libs)
+-        LIBS="-lneon @NEON_LIBS@"
+ 	# Don't add standard library paths
+         if test "$prefix" != "/usr"; then
+            LIBS="-L${libdir} ${LIBS}"
+@@ -90,7 +93,7 @@
+ 	zlib|ZLIB) support @NE_FLAG_ZLIB@ ;;
+ 	ipv6|IPV6) support @NE_FLAG_IPV6@ ;;
+ 	dav|DAV) support @NE_FLAG_DAV@ ;;
+-	lfs|LFS) support @NE_FLAG_LFS@ ;;
++	lfs|LFS) support ${has_lfs} ;;
+ 	*) support no ;;
+ 	esac
+ 	;;

neon.spec

@@ -1,12 +1,13 @@
 Summary: An HTTP and WebDAV client library
 Name: neon
 Version: 0.25.5
-Release: 3
+Release: 4
 License: LGPL
 Group: Applications/Publishing
 Prefix: %{_prefix}
 URL: http://www.webdav.org/neon/
 Source0: http://www.webdav.org/neon/neon-%{version}.tar.gz
+Patch0: neon-0.25.5-multilib.patch
 BuildRequires: expat-devel, openssl-devel, zlib-devel, krb5-devel
 BuildRequires: pkgconfig
 BuildRoot: %{_tmppath}/%{name}-root
@@ -30,6 +31,7 @@ The development library for the C language HTTP and WebDAV client library.
 
 %prep
 %setup -q
+%patch0 -p1 -b .multilib
 
 %build
 %configure --with-ssl --with-expat --enable-shared --enable-warnings
@@ -39,12 +41,6 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 %makeinstall
 
-# test suite uses port 7777
-%ifnarch ppc s390
-%check
-make -C test %{?_smp_mflags} check || true
-%endif
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -68,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 
 %changelog
+* Wed May 24 2006 Joe Orton <jorton@redhat.com> 0.25.5-4
+- add multilib fixes for neon-config (#192734)
+
 * Wed May 17 2006 Joe Orton <jorton@redhat.com> 0.25.5-3
 - rebuild