[packages/wvstreams] - removed obsolete cflags,mk patches - more verbose files - package apidocs - disable optimizations

qboosh qboosh at pld-linux.org
Wed Dec 24 13:30:09 CET 2014 

commit aceb42016f607a8e67719147193b08fefd63850e
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Dec 24 13:31:08 2014 +0100

    - removed obsolete cflags,mk patches
    - more verbose files
    - package apidocs
    - disable optimizations option (C*FLAGS override with -O2)

 wvstreams-cflags.patch | 46 --------------------------------
 wvstreams-mk.patch     | 42 -----------------------------
 wvstreams.spec         | 72 +++++++++++++++++++++++++++++++++++---------------
 3 files changed, 50 insertions(+), 110 deletions(-)
---
diff --git a/wvstreams.spec b/wvstreams.spec
index 286fb05..9901e7a 100644
--- a/wvstreams.spec
+++ b/wvstreams.spec
@@ -1,6 +1,5 @@
 #
 # TODO:
-#   - review patches: wvstreams-cflags.patch, wvstreams-mk.patch
 #   - check and/or package files:
 #    /etc/uniconf.conf
 #    /usr/bin/uni
@@ -14,8 +13,8 @@
 #
 #
 # Conditional build:
-%bcond_without	doc	# don't build documentation
-%bcond_without	slp	# build without openslp
+%bcond_without	apidocs	# Doxygen documentation
+%bcond_without	slp	# OpenSLP support
 #
 Summary:	A network programming library written in C++
 Summary(pl.UTF-8):	Biblioteka programowania sieciowego napisana w C++
@@ -24,11 +23,10 @@ Version:	4.6.1
 Release:	5
 License:	LGPL
 Group:		Libraries
+#Source0Download: http://code.google.com/p/wvstreams/downloads/list
 Source0:	http://wvstreams.googlecode.com/files/%{name}-%{version}.tar.gz
 # Source0-md5:	2760dac31a43d452a19a3147bfde571c
 Patch0:		%{name}-sort.patch
-Patch1:		%{name}-cflags.patch
-Patch2:		%{name}-mk.patch
 Patch3:		%{name}-openssl.patch
 Patch4:		%{name}-includes.patch
 Patch5:		%{name}-4.2.2-multilib.patch
@@ -41,7 +39,7 @@ BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	boost-devel
 BuildRequires:	dbus-devel >= 1.2.14
-%{?with_doc:BuildRequires:	doxygen}
+%{?with_apidocs:BuildRequires:	doxygen}
 BuildRequires:	libstdc++-devel
 %{?with_slp:BuildRequires:	openslp-devel}
 BuildRequires:	openssl-devel >= 0.9.7i
@@ -49,6 +47,7 @@ BuildRequires:	pam-devel
 BuildRequires:	pkgconfig
 BuildRequires:	readline-devel
 BuildRequires:	tcl-devel
+BuildRequires:	zlib-devel
 Obsoletes:	libwvstreams
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -76,25 +75,34 @@ files needed for developing applications which use WvStreams.
 %description devel -l pl.UTF-8
 WvStreams próbuje być wydajną, bezpieczną i łatwą w użyciu biblioteką
 do tworzenia aplikacji sieciowych. Pakiet ten zawiera pliki niezbędne
-do tworzenia aplikacji używających WvStreams.
+do kompilowania oprogramowania używającego WvStreams.
 
 %package static
-Summary:	Static wvstreams library
-Summary(pl.UTF-8):	Statyczna biblioteka wvstreams
+Summary:	Static WvStreams library
+Summary(pl.UTF-8):	Statyczna biblioteka WvStreams
 Group:		Development/Libraries
 Requires:	%{name}-devel = %{version}-%{release}
 
 %description static
-Static wvstreams library.
+Static WvStreams library.
 
 %description static -l pl.UTF-8
-Statyczna wersja biblioteki wvstreams.
+Statyczna wersja biblioteki WvStreams.
+
+%package apidocs
+Summary:	API documentation for WvStreams libraries
+Summary(pl.UTF-8):	Dokumentacja API bibliotek WvStreams
+Group:		Documentation
+
+%description apidocs
+API documentation for WvStreams libraries.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API bibliotek WvStreams.
 
 %prep
 %setup -q
 %patch0 -p1
-#%%patch1 -p1
-#%%patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
@@ -104,8 +112,10 @@ Statyczna wersja biblioteki wvstreams.
 %patch9 -p1
 
 %build
+# disable-optimization disables -O2 override
 %configure \
-	--with%{!?with_slp:out}-openslp \
+	--disable-optimization \
+	--with-openslp%{!?with_slp:=no} \
 	--without-vorbis
 
 %{__make} -j1 \
@@ -116,7 +126,7 @@ Statyczna wersja biblioteki wvstreams.
 	CXXOPTS="%{rpmcxxflags} -fPIC -fpermissive -fno-strict-aliasing -fno-tree-dce -fno-optimize-sibling-calls"
 	COPTS="%{rpmcflags} -fPIC -fPIC -fno-strict-aliasing"
 
-%if %{with doc}
+%if %{with apidocs}
 %{__make} doxygen
 %endif
 
@@ -135,17 +145,35 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc README ChangeLog
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
+%attr(755,root,root) %{_libdir}/libuniconf.so.*.*
+%attr(755,root,root) %{_libdir}/libwvbase.so.*.*
+%attr(755,root,root) %{_libdir}/libwvdbus.so.*.*
+%attr(755,root,root) %{_libdir}/libwvstreams.so.*.*
+%attr(755,root,root) %{_libdir}/libwvutils.so.*.*
 
 %files devel
 %defattr(644,root,root,755)
-#%if %{with doc}
-#%doc Docs/doxy-html/*
-#%endif
-%attr(755,root,root) %{_libdir}/lib*.so
+%attr(755,root,root) %{_libdir}/libuniconf.so
+%attr(755,root,root) %{_libdir}/libwvbase.so
+%attr(755,root,root) %{_libdir}/libwvdbus.so
+%attr(755,root,root) %{_libdir}/libwvstreams.so
+%attr(755,root,root) %{_libdir}/libwvutils.so
+%{_libdir}/libwvtest.a
 %{_includedir}/wvstreams
-%{_pkgconfigdir}/*.pc
+%{_pkgconfigdir}/libuniconf.pc
+%{_pkgconfigdir}/libwvbase.pc
+%{_pkgconfigdir}/libwvdbus.pc
+#%{_pkgconfigdir}/libwvqt.pc
+%{_pkgconfigdir}/libwvstreams.pc
+%{_pkgconfigdir}/libwvtest.pc
+%{_pkgconfigdir}/libwvutils.pc
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libwvstatic.a
+
+%if %{with apidocs}
+%files apidocs
+%defattr(644,root,root,755)
+%doc Docs/doxy-html/*
+%endif
diff --git a/wvstreams-cflags.patch b/wvstreams-cflags.patch
deleted file mode 100644
index 873c8b1..0000000
--- a/wvstreams-cflags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -Nur wvstreams-4.0.2/vars.mk wvstreams-4.0.2.cflags/vars.mk
---- wvstreams-4.0.2/vars.mk	2005-03-24 02:01:23.000000000 +0000
-+++ wvstreams-4.0.2.cflags/vars.mk	2006-02-26 23:56:16.000000000 +0000
-@@ -103,12 +103,6 @@
- #CFLAGS+=-Werror
- endif
- 
--ifneq ("$(enable_optimization)", "no")
--CXXFLAGS+=-O2
--#CXXFLAGS+=-felide-constructors
--CFLAGS+=-O2
--endif
--
- ifneq ("$(enable_warnings)", "no")
- CXXFLAGS+=-Wall -Woverloaded-virtual
- CFLAGS+=-Wall
-diff -Nur wvstreams-4.0.2/wvrules.mk wvstreams-4.0.2.cflags/wvrules.mk
---- wvstreams-4.0.2/wvrules.mk	2005-03-24 02:01:23.000000000 +0000
-+++ wvstreams-4.0.2.cflags/wvrules.mk	2006-02-26 23:55:55.000000000 +0000
-@@ -78,12 +78,6 @@
-   #CFLAGS+=-Werror
- endif
- 
--ifneq ("$(enable_optimization)", "no")
--  CXXFLAGS+=-O2
--  #CXXFLAGS+=-felide-constructors
--  CFLAGS+=-O2
--endif
--
- ifneq ("$(enable_warnings)", "no")
-   CXXFLAGS+=-Wall -Woverloaded-virtual
-   CFLAGS+=-Wall
-diff -Nur wvstreams-4.0.2/xplc/configure.ac wvstreams-4.0.2.cflags/xplc/configure.ac
---- wvstreams-4.0.2/xplc/configure.ac	2005-03-24 02:01:23.000000000 +0000
-+++ wvstreams-4.0.2.cflags/xplc/configure.ac	2006-02-26 23:56:55.000000000 +0000
-@@ -114,10 +114,6 @@
-     AC_DEFINE(ENABLE_LOADER, 1, [Define if you want to enable dynamic loading.])
- fi
- 
--if test "$enable_optimization" != "no"; then
--    CXXFLAGS="$CXXFLAGS -O2"
--fi
--
- if test -z "$enable_debug"; then
-     enable_debug=no
- fi
diff --git a/wvstreams-mk.patch b/wvstreams-mk.patch
deleted file mode 100644
index 9ea936a..0000000
--- a/wvstreams-mk.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- wvstreams-4.0.2/vars.mk~	2006-07-30 23:51:49.000000000 +0000
-+++ wvstreams-4.0.2/vars.mk	2006-07-31 00:11:36.000000000 +0000
-@@ -139,15 +139,15 @@
- libwvbase.so: LIBS+=-lxplc-cxx
- 
- ifneq ("$(with_fam)", "no")
--  libwvstreams.so: -lfam
-+  libwvstreams.so: LIBS+=-lfam
- endif
- 
- ifneq ("$(with_openslp)", "no")
--  libwvstreams.so: -lslp
-+  libwvstreams.so: LIBS+=-lslp
- endif
- 
- ifneq ("$(with_pam)", "no")
--  libwvstreams.so: -lpam
-+  libwvstreams.so: LIBS+=-lpam
- endif
- 
- LDLIBS := -lgcc $(LDLIBS) \
-diff -Nur wvstreams-4.0.2/xplc/config/config.mk.in wvstreams-4.0.2.mk/xplc/config/config.mk.in
---- wvstreams-4.0.2/xplc/config/config.mk.in	2005-03-24 02:01:23.000000000 +0000
-+++ wvstreams-4.0.2.mk/xplc/config/config.mk.in	2006-07-31 00:53:17.000000000 +0000
-@@ -42,4 +42,4 @@
- LN_S:=@LN_S@
- LIBS:=@LIBS@
- CVS2CL:=@CVS2CL@
--
-+LDFLAGS:=@LDFLAGS@
-diff -Nur wvstreams-4.0.2/xplc/config/rules.mk wvstreams-4.0.2.mk/xplc/config/rules.mk
---- wvstreams-4.0.2/xplc/config/rules.mk	2005-03-24 02:01:23.000000000 +0000
-+++ wvstreams-4.0.2.mk/xplc/config/rules.mk	2006-07-31 00:54:03.000000000 +0000
-@@ -40,7 +40,7 @@
- 	$(RANLIB) $@
- 
- %.so:
--	$(LINK.cc) $(SHARED) $^ -o $@
-+	$(LINK.cc) $(SHARED) $^ -o $@ $(LIBS)
- 
- %.dll:
- 	$(LINK.cc) $(SHARED) $^ -o $@
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/wvstreams.git/commitdiff/aceb42016f607a8e67719147193b08fefd63850e

More information about the pld-cvs-commit mailing list