[Extras-wsdlpull-svn] SF.net SVN: extras-wsdlpull:[194] trunk/wsdlpull/wsdlpull.spec

[<den...@us...>]

Revision: 194
          http://extras-wsdlpull.svn.sourceforge.net/extras-wsdlpull/?rev=194&view=rev
Author:   denis_arnaud
Date:     2010-07-11 19:27:39 +0000 (Sun, 11 Jul 2010)

Log Message:
-----------
[Dev] Added man pages and updated the Id of some files to reflect latest upstream changes.

Modified Paths:
--------------
    trunk/wsdlpull/wsdlpull.spec

Modified: trunk/wsdlpull/wsdlpull.spec
===================================================================
--- trunk/wsdlpull/wsdlpull.spec	2010-07-11 19:27:23 UTC (rev 193)
+++ trunk/wsdlpull/wsdlpull.spec	2010-07-11 19:27:39 UTC (rev 194)
@@ -9,27 +9,30 @@
 Summary: C++ Web Services client library
 Name: wsdlpull
 Version: 1.23
-Release: 1%{?dist}
-License: LGPLv2
+Release: 2%{?dist}
+License: LGPLv2 and OReilly and MIT
 Group: System Environment/Libraries
 URL: http://%{name}.sourceforge.net
 Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # That patch will be submitted upstream
-Patch0: wsdlpull-%{version}-1-fix-gcc43-compatibility.patch
+Patch0: wsdlpull-%{version}-fix-gcc43-compatibility.patch
 # That patch will be submitted upstream
-Patch1: wsdlpull-%{version}-1-fix-gnu-autotools-compatibility.patch
-#BuildRequires:
+Patch1: wsdlpull-%{version}-add-man-pages.patch
+# That patch will be submitted upstream
+Patch2: wsdlpull-%{version}-fix-gnu-autotools-compatibility.patch
+# Some documentation files are still DOS-formatted
+BuildRequires: dos2unix
 
 %description
-wsdlpull is a C++ web services client library. It includes a WSDL
+%{name} is a C++ web services client library. It includes a WSDL
 Parser, a XSD Schema Parser and Validator and XML Parser and serializer
 and an API and command line tool for dynamic WSDL inspection and
 invocation.
 
-wsdlpull comes with a generic web service client.Using wsdlpull's /wsdl/
-tool you can invoke most web services from command line without writing
-any code.
+%{name} comes with a generic web service client. Using %{name} tools,
+you can invoke most Web services from command line without writing any
+code. See http://wsdlpull.sourceforge.net for usage.
 
 %package devel
 Summary: Header files, libraries and development documentation for %{name}
@@ -46,15 +49,8 @@
 Group: Documentation
 %if 0%{?fedora} >= 10
 BuildArch: noarch
-BuildRequires: texlive-latex, texlive-dvips, texlive-utils
 %endif
-%if 0%{?fedora} < 10
-BuildRequires: tetex-latex, tetex-dvips
-%endif
-%{?el5:BuildRequires: tetex-latex, tetex-dvips}
 BuildRequires: doxygen
-#BuildRequires: graphviz
-#BuildRequires: ghostscript
 
 %description doc
 This package contains the documentation in the HTML format of the %{name}
@@ -66,52 +62,55 @@
 # Apply the g++ 4.3 compatibility patch
 %patch0 -p1
 
+# Create a directory for man pages
+%{__mkdir} man
+
+# Apply the man page patch
+%patch1 -p1
+
 # Remove any CVS sub-directory (they should not be delivered with the tar-ball)
-find . -name 'CVS' -print | xargs rm -rf
+find . -name 'CVS' -print | xargs %{__rm} -rf
 
 # Remove any a.out binary (they should not be delivered with the tar-ball)
-find . -name 'a.out' -print | xargs rm -f
+find . -name 'a.out' -print | xargs %{__rm} -f
 
 # Remove the generated HTML documentation (it should not be delivered
 # with the tar-ball, as it is generated)
 if [ -d docs/html ]; then
-  rm -rf docs/html
+  %{__rm} -rf docs/html
 fi
 
 # Adapt a little bit the structure, so as to be more compliant with
 # GNU Autotools
-mkdir config
-mv config.guess config.sub depcomp install-sh ltmain.sh missing config
-mv config.h.in src
+%{__mkdir} config
+%{__mv} config.guess config.sub depcomp install-sh ltmain.sh missing config
+%{__mv} config.h.in src
 
 # Rename the standard documentation files
-mv AUTHORS.txt AUTHORS
-mv CHANGES.txt CHANGES
-mv COPYING.txt COPYING
-mv README.txt README
+%{__mv} AUTHORS.txt AUTHORS
+dos2unix AUTHORS
+%{__mv} CHANGES.txt CHANGES
+%{__mv} COPYING.txt COPYING
+%{__mv} README.txt README
 
 # Apply the GNU Autotools compatibility patch
-%patch1 -p1
+%patch2 -p1
 
 %build
 %configure --disable-static
-make %{?_smp_mflags}
+make CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}" %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-#%%find_lang %{name}
-# remove unpackaged files from the buildroot
-#rm -f $RPM_BUILD_ROOT%{_includedir}/%{name}/config.h
-#rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
-# chmod 644 doc/html/installdox doc/html/*.png doc/html/*.ico
-rm -rf %{mydocs} && mkdir -p %{mydocs}
-mv $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html %{mydocs}
+# Remove unpackaged files from the buildroot
+%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
+%{__rm} -rf %{mydocs} && %{__mkdir_p} %{mydocs}
+%{__mv} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html %{mydocs}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf $RPM_BUILD_ROOT
 
 %post -p /sbin/ldconfig
 
@@ -121,9 +120,12 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS CHANGES COPYING README
-%{_bindir}/schema
-%{_bindir}/wsdl
+%{_bindir}/%{name}
+%{_bindir}/%{name}-schema
 %{_libdir}/lib*.so.*
+%{_mandir}/man1/%{name}.1.*
+%{_mandir}/man1/%{name}-config.1.*
+%{_mandir}/man1/%{name}-schema.1.*
 %{_datadir}/%{name}
 
 %files devel
@@ -136,10 +138,14 @@
 
 %files doc
 %defattr(-,root,root,-)
+%doc AUTHORS CHANGES COPYING README
 %doc %{mydocs}/html
-%doc AUTHORS CHANGES COPYING README
 
 
 %changelog
+* Tue Jul 11 2010 Denis Arnaud <den...@m4...> 1.23-2
+- Integrated Patrick Monnerat's remarks
+  (https://bugzilla.redhat.com/show_bug.cgi?id=502686#c6)
+
 * Tue Jun 26 2009 Denis Arnaud <den...@m4...> 1.23-1
 - Initial package, thanks to Dries Verachtert <dr...@ul...>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.