rpms/libwvstreams/devel wvstreams-4.6.1-statinclude.patch, NONE, 1.1 libwvstreams.spec, 1.46, 1.47 wvstreams-4.6.1-make.patch, 1.2, 1.3

[Ondrej Vasik]

Author: ovasik

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

Modified Files:
	libwvstreams.spec wvstreams-4.6.1-make.patch 
Added Files:
	wvstreams-4.6.1-statinclude.patch 
Log Message:
fix another missing sys/stat.h include, fix typo in configure

wvstreams-4.6.1-statinclude.patch:
 include/wvunixdgsocket.h |    1 +
 streams/wvatomicfile.cc  |    2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE wvstreams-4.6.1-statinclude.patch ---
diff -urNp wvstreams-4.6.1-orig/include/wvunixdgsocket.h wvstreams-4.6.1/include/wvunixdgsocket.h
--- wvstreams-4.6.1-orig/include/wvunixdgsocket.h	2008-07-14 21:11:35.000000000 +0200
+++ wvstreams-4.6.1/include/wvunixdgsocket.h	2010-01-13 14:01:13.000000000 +0100
@@ -4,6 +4,7 @@
 #include <sys/types.h>
 #include <sys/syslog.h>
 #include <sys/socket.h>
+#include <sys/stat.h>
 #include <fcntl.h>
 
 #include "wvlog.h"
diff -urNp wvstreams-4.6.1-orig/streams/wvatomicfile.cc wvstreams-4.6.1/streams/wvatomicfile.cc
--- wvstreams-4.6.1-orig/streams/wvatomicfile.cc	2009-05-13 23:42:52.000000000 +0200
+++ wvstreams-4.6.1/streams/wvatomicfile.cc	2010-01-13 14:40:30.000000000 +0100
@@ -11,9 +11,7 @@
 #include "wvfileutils.h"
 #include "wvstrutils.h"
 
-#ifdef MACOS
 #include <sys/stat.h>
-#endif
 
 WvAtomicFile::WvAtomicFile(WvStringParm filename, int flags, mode_t create_mode)
     : tmp_file(WvString::null)


Index: libwvstreams.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libwvstreams/devel/libwvstreams.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- libwvstreams.spec	13 Jan 2010 13:20:51 -0000	1.46
+++ libwvstreams.spec	13 Jan 2010 14:12:00 -0000	1.47
@@ -9,6 +9,8 @@ Patch1: wvstreams-4.2.2-multilib.patch
 Patch2: wvstreams-4.5-noxplctarget.patch
 #Fix parallel build (#226061)
 Patch3: wvstreams-4.6.1-make.patch
+#sys/stat.h is missing some files in rawhide build
+Patch4: wvstreams-4.6.1-statinclude.patch
 URL: http://alumnit.ca/wiki/index.php?page=WvStreams
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -34,6 +36,7 @@ needed for developing applications which
 %patch1 -p1 -b .multilib
 %patch2 -p1 -b .xplctarget
 %patch3 -p1 -b .make
+%patch4 -p1 -b .statinclude
 
 %build
 #  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
@@ -44,10 +47,10 @@ needed for developing applications which
 #  --with-qt               Qt
 #  --with-zlib             zlib (required)
 touch configure
-%configure --with-dbus=yes --with-pam --with-openssl --without-tcl --with-qt=no --disable-static
+%configure --with-dbus=yes --with-pam --with-openssl --without-tcl --with-qt=no
 
 #upstream is working with .a lib, so hardcoding path to libdbus-1.so to prevent build failures
-make %{?_smp_mflags} LIBS_DBUS=/%{_lib}/libdbus-1.so COPTS="$RPM_OPT_FLAGS -fPIC-fno-strict-aliasing" CXXOPTS="$RPM_OPT_FLAGS -fPIC -fpermissive -fno-strict-aliasing" VERBOSE=1
+make %{?_smp_mflags} LIBS_DBUS=/%{_lib}/libdbus-1.so COPTS="$RPM_OPT_FLAGS -fPIC -fno-strict-aliasing" CXXOPTS="$RPM_OPT_FLAGS -fPIC -fpermissive -fno-strict-aliasing" VERBOSE=1
 
 %install
 rm -rf $RPM_BUILD_ROOT

wvstreams-4.6.1-make.patch:
 Makefile   |    1 +
 wvrules.mk |   24 ++++++++++++------------
 2 files changed, 13 insertions(+), 12 deletions(-)

Index: wvstreams-4.6.1-make.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libwvstreams/devel/wvstreams-4.6.1-make.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- wvstreams-4.6.1-make.patch	13 Jan 2010 13:20:51 -0000	1.2
+++ wvstreams-4.6.1-make.patch	13 Jan 2010 14:12:00 -0000	1.3
@@ -45,14 +45,3 @@ index 877f700..921c41b 100644
  
  %.moc: %.h;	$(MOC) -o $@ $<
  
-diff -urNp wvstreams-4.6.1-orig/include/wvunixdgsocket.h wvstreams-4.6.1/include/wvunixdgsocket.h
---- wvstreams-4.6.1-orig/include/wvunixdgsocket.h	2008-07-14 21:11:35.000000000 +0200
-+++ wvstreams-4.6.1/include/wvunixdgsocket.h	2010-01-13 14:01:13.000000000 +0100
-@@ -4,6 +4,7 @@
- #include <sys/types.h>
- #include <sys/syslog.h>
- #include <sys/socket.h>
-+#include <sys/stat.h>
- #include <fcntl.h>
- 
- #include "wvlog.h"