rpms/libwvstreams/devel wvstreams-4.6-dbus.patch, NONE, 1.1 libwvstreams.spec, 1.38, 1.39 wvstreams-4.2.2-multilib.patch, 1.5, 1.6

[Ondrej Vasik]

Author: ovasik

Update of /cvs/extras/rpms/libwvstreams/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32619

Modified Files:
	libwvstreams.spec wvstreams-4.2.2-multilib.patch 
Added Files:
	wvstreams-4.6-dbus.patch 
Log Message:
add build requires for dbus-devel, build with libdbus-1.so(#479144), fix multilib issue with wvautoconf.h(#508418)

wvstreams-4.6-dbus.patch:

--- NEW FILE wvstreams-4.6-dbus.patch ---
diff -urNp wvstreams-4.6-orig/configure.ac wvstreams-4.6/configure.ac
--- wvstreams-4.6-orig/configure.ac	2009-05-20 20:01:18.000000000 +0200
+++ wvstreams-4.6/configure.ac	2009-06-27 18:18:52.000000000 +0200
@@ -397,7 +397,7 @@ if test "$with_dbus" != "no"; then      
     if test "$with_dbus" != "no"; then
         AC_DEFINE(WITH_DBUS,,
                   [Define to enable DBUS support.])
-        LIBS_DBUS=$DBUS_LIBDIR/libdbus-1.a
+        LIBS_DBUS=$DBUS_LIBDIR/libdbus-1.so
     fi
 fi
 
diff -urNp wvstreams-4.6-orig/configure wvstreams-4.6/configure
--- wvstreams-4.6-orig/configure	2009-06-10 18:03:36.000000000 +0200
+++ wvstreams-4.6/configure	2009-06-27 18:21:55.000000000 +0200
@@ -8351,7 +8351,7 @@ cat >>confdefs.h <<\_ACEOF
 #define WITH_DBUS /**/
 _ACEOF
 
-        LIBS_DBUS=$DBUS_LIBDIR/libdbus-1.a
+        LIBS_DBUS=$DBUS_LIBDIR/libdbus-1.so
     fi
 fi
 


Index: libwvstreams.spec
===================================================================
RCS file: /cvs/extras/rpms/libwvstreams/devel/libwvstreams.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- libwvstreams.spec	11 Jun 2009 07:53:13 -0000	1.38
+++ libwvstreams.spec	27 Jun 2009 16:32:50 -0000	1.39
@@ -1,14 +1,15 @@
 Name: libwvstreams
 Version: 4.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: WvStreams is a network programming library written in C++
 Source: http://wvstreams.googlecode.com/files/wvstreams-%{version}.tar.gz
 Patch1: wvstreams-4.2.2-multilib.patch
 Patch2: wvstreams-4.5-noxplctarget.patch
+Patch3: wvstreams-4.6-dbus.patch
 URL: http://alumnit.ca/wiki/index.php?page=WvStreams
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: openssl-devel, pkgconfig, zlib-devel, readline-devel
+BuildRequires: openssl-devel, pkgconfig, zlib-devel, readline-devel, dbus-devel
 License: LGPLv2+
 
 %description
@@ -29,6 +30,7 @@ needed for developing applications which
 %setup -q -n wvstreams-%{version}
 %patch1 -p1 -b .multilib
 %patch2 -p1 -b .xplctarget
+%patch3 -p1 -b .dbus
 
 %build
 #  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
@@ -80,6 +82,11 @@ rm -rf $RPM_BUILD_ROOT
 %postun -p /sbin/ldconfig
 
 %changelog
+* Sat Jun 27 2009 Ondrej Vasik <ovasik at redhat.com> - 4.6-2
+- add build requires for dbus-devel, build with libdbus-1.so
+  (#479144)
+- fix multilib issue with wvautoconf.h(#508418)
+
 * Thu Jun 11 2009 Ondrej Vasik <ovasik at redhat.com> - 4.6-1
 - new upstream release with dynamically linked dbus(#479144)
 

wvstreams-4.2.2-multilib.patch:

Index: wvstreams-4.2.2-multilib.patch
===================================================================
RCS file: /cvs/extras/rpms/libwvstreams/devel/wvstreams-4.2.2-multilib.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- wvstreams-4.2.2-multilib.patch	8 Jan 2009 11:49:15 -0000	1.5
+++ wvstreams-4.2.2-multilib.patch	27 Jun 2009 16:32:50 -0000	1.6
@@ -1,5 +1,14 @@
 --- wvstreams-4.5/include/wvautoconf.h.in.multilib
 +++ wvstreams-4.5/include/wvautoconf.h.in
+@@ -65,7 +65,7 @@
+ #undef HAVE_LIBCRYPTO
+ 
+ /* Whether libc supports __libc_stack_end */
+-#undef HAVE_LIBC_STACK_END
++/* #undef HAVE_LIBC_STACK_END */
+ 
+ /* Define to 1 if you have the `pam' library (-lpam). */
+ #undef HAVE_LIBPAM
 @@ -166,7 +166,7 @@
  #undef HAVE_UNISTD_H