- remove gsoap licensed files (following fedora)

- package new files from 2.8.9

diff --git a/gsoap.spec b/gsoap.spec
index c2dd5cf8989cb0d460ac2315ce4bf388ed5e7000..e8860c44f7caa9ba6663bd81820c0c0e414ce244 100644 (file)
--- a/gsoap.spec
+++ b/gsoap.spec
@@ -4,7 +4,7 @@ Summary:        gSOAP - a development toolkit for Web services
 Summary(pl.UTF-8):     gSOAP - zestawem narzędzi programistycznych dla usług WWW
 Name:          gsoap
 Version:       2.8.11
-Release:       0.3
+Release:       1
 License:       gSOAP / GPL
 Group:         Development/Libraries
 Source0:       http://downloads.sourceforge.net/gsoap2/%{name}_%{version}.zip
@@ -20,6 +20,7 @@ BuildRequires:        libtool
 BuildRequires: openssl-devel
 BuildRequires: pkgconfig
 BuildRequires: rpmbuild(macros) >= 1.583
+BuildRequires: sed >= 4.0
 BuildRequires: unzip
 BuildRequires: zlib-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -64,6 +65,10 @@ Statyczna biblioteka %{name}.
 %setup -q -n %{name}-2.8
 %patch0 -p1
 
+# remove stuff with gsoap license only - not GPL
+%{__rm} -r gsoap/extras gsoap/mod_gsoap gsoap/Symbian
+%{__sed} -i -e 's!$(srcdir)/extras/\*!!' gsoap/Makefile.am
+
 %build
 %{__libtoolize}
 %{__aclocal}
@@ -256,6 +261,17 @@ rm -rf $RPM_BUILD_ROOT
 # Additions in 2.8.7-1
 %{_datadir}/%{name}/import/wsdd10.h
 
+# Additions in 2.8.9-1
+%{_datadir}/gsoap/WS/WS-SecureConversation.xsd
+%{_datadir}/gsoap/WS/WS-Trust.wsdl
+%{_datadir}/gsoap/WS/WS-Trust.xsd
+%{_datadir}/gsoap/import/ser.h
+%{_datadir}/gsoap/import/wsc.h
+%{_datadir}/gsoap/import/wsrm5.h
+%{_datadir}/gsoap/import/wsrx5.h
+%{_datadir}/gsoap/import/wst.h
+%{_datadir}/gsoap/import/wstx.h
+
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libgsoap++.a