Browse Source

* libupnp: new upstream release

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@5959 ec354946-7b23-47d6-9f5a-488ba84defc7
shaolin 12 years ago
parent
commit
73682a0f45
1 changed files with 27 additions and 18 deletions
  1. 27 18
      lib/libu/libupnp/libupnp-vl.spec

+ 27 - 18
lib/libu/libupnp/libupnp-vl.spec

@@ -1,6 +1,9 @@
 %define name libupnp
-%define version 1.6.6
-%define release 2%{?_dist_release}
+%define version 1.6.13
+%define release 1%{?_dist_release}
+
+%define docdeveldir %{_docdir}/%{name}-devel-%{version}
+%define docdir %{_docdir}/%{name}-%{version}
 
 Summary: Universal Plug and Play (UPnP) SDK
 Summary(ja): ユニバーサルプラグアンドプレイ開発キット
@@ -8,7 +11,6 @@ Name: %{name}
 Version: %{version}
 Release: %{release}
 Source0: %{name}-%{version}.tar.bz2
-Patch0: %{name}-1.6.5.patch
 License: BSD
 Group: System Environment/Libraries
 URL: http://pupnp.sourceforge.net/
@@ -32,32 +34,39 @@ you will need to install %{name}-devel.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
-%configure --with-documentation="/rpm-doc"
+%configure --with-documentation --enable-static=no
 %{__make} %{?_smp_mflags}
 
 %install
-%{__rm} -rf ${RPM_BUILD_ROOT}
-%{__make} install DESTDIR="${RPM_BUILD_ROOT}"
+%{__rm} -rf %{buildroot}
+%{__make} install DESTDIR="%{buildroot}"
 
-#
-%{__rm} ${RPM_BUILD_ROOT}%{_libdir}/*.la
+#create the doc devel dir
+%{__mkdir_p} %{buildroot}%{docdeveldir}
 
-### Clean up buildroot
-cp -pr ${RPM_BUILD_ROOT}/rpm-doc/ .
-rm -rf ${RPM_BUILD_ROOT}/rpm-doc/
-#{__mv} -f ${RPM_BUILD_ROOT}/rpm-doc/ .
+#mv examples dir and pdf file to the doc devel dir
+%{__mv} %{buildroot}%{docdir}/examples \
+        %{buildroot}%{docdeveldir}/
+%{__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}
 
 %post -p /sbin/ldconfig
+
 %postun -p /sbin/ldconfig
 
 %clean
 %{__rm} -rf ${RPM_BUILD_ROOT}
 
 %files
-%defattr(-, root, root, 0755)
+%defattr(-, root, root, -)
 %doc AUTHORS ChangeLog COPYING INSTALL LICENSE NEWS README THANKS TODO
 %{_libdir}/libixml.so.*
 %{_libdir}/libthreadutil.so.*
@@ -65,17 +74,17 @@ rm -rf ${RPM_BUILD_ROOT}/rpm-doc/
 
 %files devel
 %defattr(-, root, root, 0755)
-%doc rpm-doc/*
+%doc %{docdeveldir}
 %{_includedir}/upnp/
-%{_libdir}/libixml.a
 %{_libdir}/libixml.so
-%{_libdir}/libthreadutil.a
 %{_libdir}/libthreadutil.so
-%{_libdir}/libupnp.a
 %{_libdir}/libupnp.so
 %{_libdir}/pkgconfig/libupnp.pc
 
 %changelog
+* Thu Mar 22 2012 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 1.6.13-1
+- new upstream release
+
 * Sun Sep 26 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.6.6-2
 - rebuild with rpm-4.8.1 for pkg-config file