rpms/libwvstreams/devel wvstreams-4.5-noxplctarget.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 libwvstreams-4.4.1-gcc43.patch, 1.1, 1.2 libwvstreams.spec, 1.31, 1.32 sources, 1.8, 1.9 wvstreams-4.2.2-multilib.patch, 1.3, 1.4
Ondrej Vasik
ovasik at fedoraproject.org
Fri Nov 21 16:38:10 UTC 2008
Author: ovasik
Update of /cvs/extras/rpms/libwvstreams/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19790
Modified Files:
.cvsignore libwvstreams-4.4.1-gcc43.patch libwvstreams.spec
sources wvstreams-4.2.2-multilib.patch
Added Files:
wvstreams-4.5-noxplctarget.patch
Log Message:
new upstream release, fixed several issues (install-xplc target missing, gcc-4.3 issues), updated optional configure options list in spec file
wvstreams-4.5-noxplctarget.patch:
--- NEW FILE wvstreams-4.5-noxplctarget.patch ---
diff -urNp wvstreams-4.5-orig/install.mk wvstreams-4.5/install.mk
--- wvstreams-4.5-orig/install.mk 2008-10-21 17:31:58.000000000 +0200
+++ wvstreams-4.5/install.mk 2008-11-21 16:17:28.000000000 +0100
@@ -45,3 +45,7 @@ install-uniconfd: uniconf/daemon/uniconf
install-wsd: ipstreams/tests/wsd
$(INSTALL) -d $(DESTDIR)$(bindir)
$(INSTALL_PROGRAM) ipstreams/tests/wsd $(DESTDIR)$(bindir)/
+
+install-xplc: ipstreams/tests/xplctest
+ $(INSTALL) -d $(DESTDIR)$(bindir)
+ $(INSTALL_PROGRAM) ipstreams/tests/xplctest $(DESTDIR)$(bindir)/
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libwvstreams/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 28 Nov 2007 14:56:13 -0000 1.8
+++ .cvsignore 21 Nov 2008 16:37:39 -0000 1.9
@@ -1,2 +1 @@
-wvstreams-4.4.tar.gz
-wvstreams-4.4.1.tar.gz
+wvstreams-4.5.tar.gz
libwvstreams-4.4.1-gcc43.patch:
Index: libwvstreams-4.4.1-gcc43.patch
===================================================================
RCS file: /cvs/extras/rpms/libwvstreams/devel/libwvstreams-4.4.1-gcc43.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libwvstreams-4.4.1-gcc43.patch 12 Feb 2008 17:51:08 -0000 1.1
+++ libwvstreams-4.4.1-gcc43.patch 21 Nov 2008 16:37:39 -0000 1.2
@@ -1,25 +1,3 @@
-diff -urNp wvstreams-4.4.1-orig/include/iwvstream.h wvstreams-4.4.1/include/iwvstream.h
---- wvstreams-4.4.1-orig/include/iwvstream.h 2007-08-17 07:15:30.000000000 +0200
-+++ wvstreams-4.4.1/include/iwvstream.h 2008-02-12 14:24:23.000000000 +0100
-@@ -11,6 +11,7 @@
- #include "wvcallback.h"
- #include "wvbuf.h"
- #include "wvxplc.h"
-+#include <climits>
-
-
- class WvAddr;
-diff -urNp wvstreams-4.4.1-orig/include/uniconfkey.h wvstreams-4.4.1/include/uniconfkey.h
---- wvstreams-4.4.1-orig/include/uniconfkey.h 2007-07-19 23:22:49.000000000 +0200
-+++ wvstreams-4.4.1/include/uniconfkey.h 2008-02-12 14:23:50.000000000 +0100
-@@ -9,6 +9,7 @@
-
- #include "wvstring.h"
- #include "wvlinklist.h"
-+#include <climits>
-
-
- // The Python headers try to #define ANY as void. If we're building Python
diff -urNp wvstreams-4.4.1-orig/include/wvserialize.h wvstreams-4.4.1/include/wvserialize.h
--- wvstreams-4.4.1-orig/include/wvserialize.h 2007-08-17 07:15:30.000000000 +0200
+++ wvstreams-4.4.1/include/wvserialize.h 2008-02-12 16:33:44.000000000 +0100
@@ -46,25 +24,15 @@
diff -urNp wvstreams-4.4.1-orig/uniconf/uniconf.cc wvstreams-4.4.1/uniconf/uniconf.cc
--- wvstreams-4.4.1-orig/uniconf/uniconf.cc 2007-07-19 23:22:35.000000000 +0200
+++ wvstreams-4.4.1/uniconf/uniconf.cc 2008-02-12 15:04:45.000000000 +0100
-@@ -8,6 +8,7 @@
+@@ -8,6 +8,8 @@
#include "uniconfroot.h"
#include "uniconfgen.h"
#include "wvstream.h"
+#include <climits>
++#include <algorithm>
#include <assert.h>
-diff -urNp wvstreams-4.4.1-orig/utils/wvargs.cc wvstreams-4.4.1/utils/wvargs.cc
---- wvstreams-4.4.1-orig/utils/wvargs.cc 2007-08-17 07:15:30.000000000 +0200
-+++ wvstreams-4.4.1/utils/wvargs.cc 2008-02-12 14:25:38.000000000 +0100
-@@ -15,6 +15,7 @@
- #undef __argv
-
- #include <argp.h>
-+#include <climits>
-
-
- class WvArgsOption
diff -urNp wvstreams-4.4.1-orig/utils/wvtclstring.cc wvstreams-4.4.1/utils/wvtclstring.cc
--- wvstreams-4.4.1-orig/utils/wvtclstring.cc 2007-07-19 23:22:55.000000000 +0200
+++ wvstreams-4.4.1/utils/wvtclstring.cc 2008-02-12 14:25:56.000000000 +0100
@@ -76,16 +44,3 @@
const WvStringMask WVTCL_NASTY_SPACES(WVTCL_NASTY_SPACES_STR);
const WvStringMask WVTCL_NASTY_NEWLINES(WVTCL_NASTY_NEWLINES_STR);
-diff -urNp wvstreams-4.4.1-orig/utils/wvtimeutils.cc wvstreams-4.4.1/utils/wvtimeutils.cc
---- wvstreams-4.4.1-orig/utils/wvtimeutils.cc 2007-07-19 23:22:55.000000000 +0200
-+++ wvstreams-4.4.1/utils/wvtimeutils.cc 2008-02-12 14:25:15.000000000 +0100
-@@ -4,7 +4,7 @@
- *
- * Various little time functions...
- */
--#include <limits.h>
-+#include <climits>
-
- #include "wvtimeutils.h"
-
-
Index: libwvstreams.spec
===================================================================
RCS file: /cvs/extras/rpms/libwvstreams/devel/libwvstreams.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- libwvstreams.spec 29 Aug 2008 15:13:25 -0000 1.31
+++ libwvstreams.spec 21 Nov 2008 16:37:39 -0000 1.32
@@ -1,11 +1,12 @@
Name: libwvstreams
-Version: 4.4.1
-Release: 5%{?dist}
+Version: 4.5
+Release: 1%{?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.4-no_sarestorer.patch
Patch3: libwvstreams-4.4.1-gcc43.patch
+Patch4: wvstreams-4.5-noxplctarget.patch
URL: http://alumnit.ca/wiki/index.php?page=WvStreams
Group: System Environment/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -31,24 +32,18 @@
%patch1 -p1 -b .multilib
%patch2 -p1 -b .no_sarestore
%patch3 -p1 -b .gcc43
+%patch4 -p1 -b .xplctarget
%build
-# --with-fam FAM
-# --with-fftw FFTW
-# --with-bdb Berkeley DB 1.x (or compatible)
-# --with-gdbm GDBM
-# --with-ogg Ogg
-# --with-openssl OpenSSL
+# --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
+# --with-dbus DBUS
+# --with-openssl OpenSSL >= 0.9.7 (required)
# --with-pam PAM
# --with-tcl Tcl
-# --with-swig SWIG
# --with-qt Qt
-# --with-speex Speex
-# --with-vorbis Vorbis
-# --with-xplc XPLC
-# --with-zlib zlib
+# --with-zlib zlib (required)
touch configure
-%configure --with-pam --with-openssl --without-fam --without-fftw --without-gdbm --without-pgg --without-tcl --without-swig --without-qt --without-speex --without-vorbis --with-xplc --disable-static
+%configure --with-dbus=no --with-pam --with-openssl --without-tcl --with-qt=no --disable-static
make COPTS="$RPM_OPT_FLAGS -fPIC -fpermissive" CXXOPTS="$RPM_OPT_FLAGS -fPIC -fpermissive" VERBOSE=1
@@ -62,10 +57,8 @@
rm -f \
./etc/uniconf.conf \
.%{_bindir}/uni \
- .%{_libdir}/pkgconfig/liboggspeex.pc \
- .%{_libdir}/pkgconfig/liboggvorbis.pc \
- .%{_libdir}/pkgconfig/libwvfft.pc \
.%{_libdir}/pkgconfig/libwvqt.pc \
+ .%{_libdir}/pkgconfig/libwvdbus.pc \
.%{_sbindir}/uniconfd \
.%{_mandir}/man8/uni.8* \
.%{_mandir}/man8/uniconfd.8* \
@@ -77,7 +70,7 @@
%files
%defattr(-,root,root)
-%doc COPYING.LIB README
+%doc LICENSE README
%{_libdir}/*.so.*
%files devel
@@ -92,6 +85,12 @@
%postun -p /sbin/ldconfig
%changelog
+* Fri Nov 22 2008 Ondrej Vasik <ovasik at redhat.com> - 4.5-1
+- new upstream release
+- fixed issue with missing install-xplc target and std::sort
+ missing gcc-4.3 error
+- updated optional configure options list in spec file
+
* Fri Aug 28 2008 Ondrej Vasik <ovasik at redhat.com> - 4.4.1-5
- patch fuzz clean up
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libwvstreams/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 28 Nov 2007 14:56:13 -0000 1.8
+++ sources 21 Nov 2008 16:37:39 -0000 1.9
@@ -1 +1 @@
-907b0cba8931553d848620ea16f006b9 wvstreams-4.4.1.tar.gz
+8cc00e69d70fa0071595b7e919cbb1e0 wvstreams-4.5.tar.gz
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wvstreams-4.2.2-multilib.patch 29 Aug 2008 15:13:25 -0000 1.3
+++ wvstreams-4.2.2-multilib.patch 21 Nov 2008 16:37:39 -0000 1.4
@@ -1,21 +1,25 @@
---- wvstreams-4.2.2/include/wvautoconf.h.in.multilib 2006-05-24 12:49:33.000000000 +0200
-+++ wvstreams-4.2.2/include/wvautoconf.h.in 2006-05-24 12:51:18.000000000 +0200
-@@ -291,7 +291,7 @@
+--- wvstreams-4.5/include/wvautoconf.h.in.multilib
++++ wvstreams-4.5/include/wvautoconf.h.in
+@@ -166,7 +166,7 @@
#undef HAVE_UNISTD_H
/* Define to 1 if you have the <valgrind/memcheck.h> header file. */
-#undef HAVE_VALGRIND_MEMCHECK_H
+/* #undef HAVE_VALGRIND_MEMCHECK_H */
- /* Define to 1 if you have the `vasnprintf' function. */
- #undef HAVE_VASNPRINTF
-@@ -357,11 +357,13 @@
+ /* Define to 1 if you have the <zlib.h> header file. */
+ #undef HAVE_ZLIB_H
+@@ -201,7 +201,7 @@
#undef VERBOSE_PACKAGE_VERSION
/* Extra version string. */
-#undef VER_STRING_EXTRA
+/*#define VER_STRING_EXTRA " (Red Hat Buildsystem)"*/
+ /* Define to enable DBUS support. */
+ #undef WITH_DBUS
+@@ -208,7 +208,9 @@
+
/* Define to 1 if your processor stores words with the most significant byte
first (like Motorola and SPARC, unlike Intel and VAX). */
-#undef WORDS_BIGENDIAN
More information about the fedora-extras-commits
mailing list