auto-import libupnp-1.4.1-1 on branch devel from libupnp-1.4.1-1.src.rpm

.cvsignore

@@ -1,2 +1 @@
-UPnP_1_4_0_Programming_Guide.pdf
-libupnp-1.4.0.tar.gz
+libupnp-1.4.1.tar.gz

libupnp.spec

@@ -1,13 +1,11 @@
-Version: 1.4.0
+Version: 1.4.1
 Summary: Universal Plug and Play (UPnP) SDK
 Name: libupnp
-Release: 3%{?dist}
+Release: 1%{?dist}
 License: BSD
 Group: System Environment/Libraries
 URL: http://www.libupnp.org/
 Source: http://puzzle.dl.sourceforge.net/sourceforge/pupnp/%{name}-%{version}.tar.gz
-Source1: http://puzzle.dl.sourceforge.net/sourceforge/pupnp/UPnP_1_4_0_Programming_Guide.pdf
-Patch0: libupnparch.diff
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %define docdir %{_docdir}/%{name}-%{version}-%{release}
@@ -29,9 +27,6 @@ the UPnP SDK libraries.
 
 %prep
 %setup -q
-%patch0 -p1
-
-#chmod 644 {LICENSE,README}
 
 %build
 %configure --with-docdir=%{docdir}/ 
@@ -40,18 +35,19 @@ make %{?_smp_mflags}
 %install
 test "$RPM_BUILD_ROOT" != "/" && rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-#delete the empty pdf
-%{__rm} %{buildroot}%{docdir}/UPnP_Programming_Guide.pdf
 
 #create the doc devel dir
 %{__mkdir_p} %{buildroot}%{docdeveldir}
 
-#mv examples dir to he doc devel dir
+#mv examples dir and pdf file to the doc devel dir
 %{__mv} %{buildroot}%{docdir}/examples \
 	%{buildroot}%{docdeveldir}/
-
-#install the right pdf in the doc devel dir
-install -D -m0644 %{SOURCE1} %{buildroot}%{docdeveldir}/UPnP_1_4_0_Programming_Guide.pdf
+%{__mv} %{buildroot}%{docdir}/UPnP_Programming_Guide.pdf \
+	%{buildroot}%{docdeveldir}/
+%{__mv} %{buildroot}%{docdir}/IXML_Programming_Guide.pdf \
+	%{buildroot}%{docdeveldir}/
+%{__mv} %{buildroot}%{docdir}/html \
+	%{buildroot}%{docdeveldir}/
 
 %{__rm} %{buildroot}%{_libdir}/{libixml.la,libthreadutil.la,libupnp.la}
 
@@ -82,6 +78,9 @@ install -D -m0644 %{SOURCE1} %{buildroot}%{docdeveldir}/UPnP_1_4_0_Programming_G
 rm -rf %{buildroot}
 
 %changelog
+* Wed Jul 05 2006 Eric Tanguy <eric.tanguy@univ-nantes.fr> - 1.4.1-1
+- Update to version 1.4.1
+
 * Fri Jun 23 2006 Eric Tanguy <eric.tanguy@univ-nantes.fr> - 1.4.0-3
 - modified patch for x86_64 arch
 

libupnparch.diff

@@ -1,20 +0,0 @@
---- libupnp-1.4.0/upnp/src/api/upnptools.c	2006-06-06 07:37:44.000000000 +0200
-+++ libupnp-1.4.0/upnp/src/api/upnptools.c	2006-06-26 20:19:51.000000000 +0200
-@@ -345,7 +345,7 @@
-                 const char *Arg,
-                 ... )
- {
--    va_list ArgList=NULL;
-+    va_list ArgList;
-     IXML_Document *out = NULL;
- 
-     if( NumArg > 0 ) {
-@@ -387,7 +387,7 @@
-                         const char *Arg,
-                         ... )
- {
--    va_list ArgList=NULL;
-+    va_list ArgList;
-     IXML_Document *out = NULL;
- 
-     if( NumArg > 0 ) {

sources

@@ -1,2 +1 @@
-4d8e49398a277ed83391e56bbf7e6831  UPnP_1_4_0_Programming_Guide.pdf
-581c8017dc1b36d29ba034ce1e178c83  libupnp-1.4.0.tar.gz
+f3b55c24ff77ee6789d758ec1634d5e7  libupnp-1.4.1.tar.gz