|
|
@@ -1,8 +1,13 @@
|
|
|
-Summary: WvStreams is a network programming library written in C++
|
|
|
-Summary: WvStreams - C++ で記述されたネットワークプログラミングライブラリ
|
|
|
Name: libwvstreams
|
|
|
Version: 4.6.1
|
|
|
-Release: 1%{?_dist_release}
|
|
|
+Release: 2%{?_dist_release}
|
|
|
+Summary: WvStreams is a network programming library written in C++
|
|
|
+Summary(ja): WvStreams - C++ で記述されたネットワークプログラミングライブラリ
|
|
|
+
|
|
|
+License: LGPLv2+
|
|
|
+Group: System Environment/Libraries
|
|
|
+URL: https://code.google.com/p/wvstreams/
|
|
|
+
|
|
|
Source: http://wvstreams.googlecode.com/files/wvstreams-%{version}.tar.gz
|
|
|
#fixed multilib issue (bug #192717)
|
|
|
Patch1: wvstreams-4.2.2-multilib.patch
|
|
|
@@ -15,11 +20,12 @@ Patch4: wvstreams-4.6.1-statinclude.patch
|
|
|
#const X509V3_EXT_METHOD * -> X509V3_EXT_METHOD * conversion not allowed
|
|
|
#by rawhide gcc
|
|
|
Patch5: wvstreams-4.6.1-gcc.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
|
|
|
-License: LGPLv2+
|
|
|
+# fix missing unistd.h header for gcc 4.7
|
|
|
+Patch6: wvstreams-4.6.1-gcc47.patch
|
|
|
+Patch7: wvstreams-4.6.1-magic.patch
|
|
|
+
|
|
|
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
|
|
+BuildRequires: openssl-devel, pkgconfig, zlib-devel, readline-devel, dbus-devel
|
|
|
|
|
|
%description
|
|
|
WvStreams aims to be an efficient, secure, and easy-to-use library for
|
|
|
@@ -27,6 +33,7 @@ doing network applications development.
|
|
|
|
|
|
%package devel
|
|
|
Summary: Development files for WvStreams
|
|
|
+Summary(ja): WvStreams の開発用ファイル
|
|
|
Group: Development/Libraries
|
|
|
Requires: %{name} = %{version}-%{release}
|
|
|
|
|
|
@@ -42,24 +49,22 @@ needed for developing applications which use WvStreams.
|
|
|
%patch3 -p1 -b .make
|
|
|
%patch4 -p1 -b .statinclude
|
|
|
%patch5 -p1 -b .gcc
|
|
|
+%patch6 -p1 -b .gcc47
|
|
|
+%patch7 -p1 -b .magic
|
|
|
|
|
|
%build
|
|
|
-# --with-fam FAM
|
|
|
-# --with-fftw FFTW
|
|
|
-# --with-bdb Berkeley DB 1.x (or compatible)
|
|
|
-# --with-gdbm GDBM
|
|
|
-# --with-ogg Ogg
|
|
|
-# --with-openssl OpenSSL
|
|
|
+export CXXFLAGS="$RPM_OPT_FLAGS -fPIC -fpermissive -fno-strict-aliasing -fno-tree-dce -fno-optimize-sibling-calls"
|
|
|
+export CFLAGS="$RPM_OPT_FLAGS -fPIC -fno-strict-aliasing"
|
|
|
+
|
|
|
+# --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 --with-pam --with-openssl --without-tcl --without-qt --with-zlib
|
|
|
|
|
|
make COPTS="$RPM_OPT_FLAGS -fPIC -fpermissive" CXXOPTS="$RPM_OPT_FLAGS -fPIC -fpermissive" VERBOSE=1
|
|
|
|
|
|
@@ -88,7 +93,7 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
|
|
|
%files
|
|
|
%defattr(-,root,root)
|
|
|
-%doc COPYING.LIB README
|
|
|
+%doc LICENSE README
|
|
|
%{_libdir}/*.so.*
|
|
|
|
|
|
%files devel
|
|
|
@@ -96,12 +101,21 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
%{_includedir}/wvstreams
|
|
|
%{_libdir}/*.so
|
|
|
%{_libdir}/*.a
|
|
|
+%{_libdir}/valgrind/*.supp
|
|
|
%{_libdir}/pkgconfig/*.pc
|
|
|
|
|
|
%post -p /sbin/ldconfig
|
|
|
%postun -p /sbin/ldconfig
|
|
|
|
|
|
%changelog
|
|
|
+* Tue Feb 24 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 4.6.1-2
|
|
|
+- added Patch6 and 7 from Feroda
|
|
|
+ * Mon Jun 04 2012 Michal Sekletar <msekleta@redhat.com> - 4.6.1-5
|
|
|
+ - Fix crashes caused by compiler optimizations, #812651
|
|
|
+ * Thu Jan 05 2012 Jan Synáček <jsynacek@redhat.com> - 4.6.1-4
|
|
|
+ - Fix missing unistd.h header for gcc 4.7
|
|
|
+- updated URL
|
|
|
+
|
|
|
* Sun Mar 20 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 4.6.1-1
|
|
|
- update to 4.6.1
|
|
|
- fix Patch1 (wvstreams-4.2.2-multilib.patch)
|
inagaki