From 0f5b54473908245f79343361c9f8566f3a7235b2 Mon Sep 17 00:00:00 2001 From: Eric Tanguy Date: Fri, 23 Jun 2006 06:58:57 +0000 Subject: [PATCH] auto-import libupnp-1.4.0-1 on branch devel from libupnp-1.4.0-1.src.rpm --- .cvsignore | 3 ++- libupnp.spec | 39 ++++++++++++++++++++++++++++++--------- sources | 3 ++- 3 files changed, 34 insertions(+), 11 deletions(-) diff --git a/.cvsignore b/.cvsignore index b088e2a..bb0e667 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ -libupnp-1.3.1.tar.gz +UPnP_1_4_0_Programming_Guide.pdf +libupnp-1.4.0.tar.gz diff --git a/libupnp.spec b/libupnp.spec index c40ca7f..4cb38b1 100644 --- a/libupnp.spec +++ b/libupnp.spec @@ -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 @@ the UPnP SDK libraries. %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 %{buildroot}%{_libdir}/{libixml.la,libthreadutil.la,libupnp.la} rm -rf %{buildroot} %changelog +* Sun Jun 11 2006 Eric Tanguy - 1.4.0-1 +- Update to 1.4.0 + * Sun Mar 05 2006 Eric Tanguy - 1.3.1-1 - Update to 1.3.1 diff --git a/sources b/sources index 152bb26..1bb24e7 100644 --- a/sources +++ b/sources @@ -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