From 342b3d2977cb34080da832cc4a59cc8c5da468f8 Mon Sep 17 00:00:00 2001
From: Eric Tanguy <tanguy@fedoraproject.org>
Date: Mon, 14 Aug 2006 16:14:39 +0000
Subject: [PATCH] auto-import libupnp-1.4.1-1 on branch devel from
 libupnp-1.4.1-1.src.rpm

---
 .cvsignore       |  3 +--
 libupnp.spec     | 27 +++++++++++++--------------
 libupnparch.diff | 20 --------------------
 sources          |  3 +--
 4 files changed, 15 insertions(+), 38 deletions(-)
 delete mode 100644 libupnparch.diff

diff --git a/.cvsignore b/.cvsignore
index bb0e667..5daa0e2 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1 @@
-UPnP_1_4_0_Programming_Guide.pdf
-libupnp-1.4.0.tar.gz
+libupnp-1.4.1.tar.gz
diff --git a/libupnp.spec b/libupnp.spec
index 5832bce..c087e43 100644
--- a/libupnp.spec
+++ b/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,29 +27,27 @@ the UPnP SDK libraries.
 
 %prep
 %setup -q
-%patch0 -p1
-
-#chmod 644 {LICENSE,README}
 
 %build
-%configure --with-docdir=%{docdir}/
+%configure --with-docdir=%{docdir}/ 
 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
 
diff --git a/libupnparch.diff b/libupnparch.diff
deleted file mode 100644
index df50c31..0000000
--- a/libupnparch.diff
+++ /dev/null
@@ -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 ) {
diff --git a/sources b/sources
index 1bb24e7..5694b06 100644
--- a/sources
+++ b/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