rpms/libupnp/devel .cvsignore, 1.3, 1.4 libupnp.spec, 1.4, 1.5 sources, 1.3, 1.4

[Eric Tanguy (tanguy)]

Author: tanguy

Update of /cvs/extras/rpms/libupnp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28638/devel

Modified Files:
	.cvsignore libupnp.spec sources 
Log Message:
auto-import libupnp-1.4.0-1 on branch devel from libupnp-1.4.0-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libupnp/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Mar 2006 17:00:15 -0000	1.3
+++ .cvsignore	23 Jun 2006 06:58:57 -0000	1.4
@@ -1 +1,2 @@
-libupnp-1.3.1.tar.gz
+UPnP_1_4_0_Programming_Guide.pdf
+libupnp-1.4.0.tar.gz


Index: libupnp.spec
===================================================================
RCS file: /cvs/extras/rpms/libupnp/devel/libupnp.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libupnp.spec	6 Mar 2006 17:00:15 -0000	1.4
+++ libupnp.spec	23 Jun 2006 06:58:57 -0000	1.5
@@ -1,13 +1,17 @@
-Version: 1.3.1
+Version: 1.4.0
 Summary: Universal Plug and Play (UPnP) SDK
 Name: libupnp
 Release: 1%{?dist}
 License: BSD
 Group: System Environment/Libraries
-URL: http://upnp.sourceforge.net/
-Source: http://ovh.dl.sourceforge.net/sourceforge/upnp/%{name}-%{version}.tar.gz
+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
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%define docdir %{_docdir}/%{name}-%{version}-%{release}
+%define docdeveldir %{_docdir}/%{name}-devel-%{version}-%{release}
+
 %description
 The Universal Plug and Play (UPnP) SDK for Linux provides 
 support for building UPnP-compliant control points, devices, 
@@ -25,30 +29,44 @@
 %prep
 %setup -q
 
-chmod 644 {LICENSE,README}
+#chmod 644 {LICENSE,README}
 
 %build
-%configure
+%configure --with-docdir=%{docdir}/
 make %{?_smp_mflags}
 
 %install
-rm -rf %{buildroot}
-%makeinstall
+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} %{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
+
+%{__rm} %{buildroot}%{_libdir}/{libixml.la,libthreadutil.la,libupnp.la}
 
-rm %{buildroot}%{_libdir}/{libixml.la,libthreadutil.la,libupnp.la}
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE README NEWS
+%doc %{docdir}
 %{_libdir}/libixml.so.*
 %{_libdir}/libthreadutil.so.*
 %{_libdir}/libupnp.so.*
 
 %files devel
 %defattr(0644,root,root,0755)
+%doc %{docdeveldir}
 %{_includedir}/upnp/
 %{_libdir}/libixml.so
 %{_libdir}/libthreadutil.so
@@ -62,6 +80,9 @@
 rm -rf %{buildroot}
 
 %changelog
+* Sun Jun 11 2006 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 1.4.0-1
+- Update to 1.4.0
+
 * Sun Mar 05 2006 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 1.3.1-1
 - Update to 1.3.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libupnp/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Mar 2006 17:00:15 -0000	1.3
+++ sources	23 Jun 2006 06:58:57 -0000	1.4
@@ -1 +1,2 @@
-6646be5e31e58188e8f47c6ce64faa4c  libupnp-1.3.1.tar.gz
+4d8e49398a277ed83391e56bbf7e6831  UPnP_1_4_0_Programming_Guide.pdf
+581c8017dc1b36d29ba034ce1e178c83  libupnp-1.4.0.tar.gz