[gstreamer-rtsp] update 0.10.8, cleanup and update spec file

Tue Aug 16 22:11:04 UTC 2011

commit 84c58fb355185e160b5bb693d6266b2d00ebbda8
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Tue Aug 16 23:10:38 2011 +0100

    update 0.10.8, cleanup and update spec file

 .gitignore             |    1 +
 gst-rtsp-fixpygo.patch |   15 +++++++++++++++
 gstreamer-rtsp.spec    |   44 ++++++++++++++++++++++----------------------
 sources                |    2 +-
 4 files changed, 39 insertions(+), 23 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 13c5832..79ad429 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 gst-rtsp-0.10.5.tar.bz2
 /gst-rtsp-0.10.7.tar.bz2
+/gst-rtsp-0.10.8.tar.bz2
diff --git a/gst-rtsp-fixpygo.patch b/gst-rtsp-fixpygo.patch
new file mode 100644
index 0000000..fde4fa9
--- /dev/null
+++ b/gst-rtsp-fixpygo.patch
@@ -0,0 +1,15 @@
+--- gst-rtsp-0.10.8/configure.ac.orig	2011-08-16 22:00:21.782945720 +0100
++++ gst-rtsp-0.10.8/configure.ac	2011-08-16 22:01:52.042981831 +0100
+@@ -111,11 +111,11 @@
+ 
+ AM_CHECK_PYTHON_HEADERS([HAVE_PYTHON_HEADERS=yes],[HAVE_PYTHON_HEADERS=no])
+ 
++AC_SUBST(PYGOBJECT_REQ, 2.11.2)
+ dnl check for pygobject (optional, used in the bindings)
+ PKG_CHECK_MODULES(PYGOBJECT, pygobject-2.0 >= $PYGOBJECT_REQ,
+   [HAVE_PYGOBJECT="yes"], [HAVE_PYGOBJECT="no"])
+ AC_SUBST(PYGOBJECT_CFLAGS)
+-AC_SUBST(PYGOBJECT_REQ, 2.11.2)
+ 
+ dnl check for gst-python
+ PKG_CHECK_MODULES(PYGST, gst-python-0.10,
diff --git a/gstreamer-rtsp.spec b/gstreamer-rtsp.spec
index 25ba35d..1538b45 100644
--- a/gstreamer-rtsp.spec
+++ b/gstreamer-rtsp.spec
@@ -1,25 +1,24 @@
-# Python sitelib macro trick from http://fedoraproject.org/wiki/PackagingDrafts/Python
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 
 Name:		gstreamer-rtsp
-Version:	0.10.7
-Release:	3%{?dist}
+Version:	0.10.8
+Release:	1%{?dist}
 Summary:	GStreamer RTSP server library
 
 Group:		Applications/Multimedia
 License:	LGPLv2+
 URL:		http://people.freedesktop.org/~wtay/
-Source0:	http://people.freedesktop.org/~wtay/gst-rtsp-%{version}.tar.bz2
-BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+Source0:	http://gstreamer.freedesktop.org/src/gst-rtsp/gst-rtsp-%{version}.tar.bz2
+Patch0:		gst-rtsp-fixpygo.patch
 
 BuildRequires:	gstreamer-devel gstreamer-plugins-base-devel
 BuildRequires:	python-devel gstreamer-python-devel pygobject2-devel
 BuildRequires:	gobject-introspection-devel
-BuildRequires:	vala-devel
+BuildRequires:	vala-devel vala-tools
 BuildRequires:	chrpath
 
-# See http://cgit.freedesktop.org/gstreamer/gst-rtsp-server/commit/?id=2e1054036d24496ebe7311ed5cd412df95e98343
-BuildRequires:	automake autoconf libtool
+BuildRequires: automake autoconf libtool
 
 %description
 A GStreamer-based RTSP server library, with Python and Vala bindings.
@@ -58,10 +57,8 @@ Vala bindings for %{name}, the GStreamer RTSP server library.
 
 %prep
 %setup -q -n gst-rtsp-%{version}
+%patch0 -p1 -b .fix-pygo
 
-# Work-around ancient introspection.m4 file
-rm -f  common/m4/introspection.m4
-aclocal -Icommon/m4/
 autoreconf -f
 
 %build
@@ -71,18 +68,17 @@ autoreconf -f
 make %{?_smp_mflags} V=1
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT/%{_libdir}/libgstrtspserver-0.10.la \
-	$RPM_BUILD_ROOT/%{_libdir}/python*/site-packages/gst-0.10/gst/rtspserver.{a,la}
+
+#Remove libtool archives and static
+find %{buildroot} -name '*.la' -exec rm -f {} ';'
+find %{buildroot} -name '*.a' -exec rm -f {} ';'
 
 # Remove rpath as per https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath
 # can't tweak libtool, see:
 # https://bugzilla.gnome.org/show_bug.cgi?id=634376#c1
-chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libgstrtspserver-0.10.so*
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+chrpath --delete %{buildroot}%{_libdir}/libgstrtspserver-0.10.so*
+chrpath --delete %{buildroot}%{python_sitearch}/gst-0.10/gst/rtspserver.so
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -99,12 +95,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/gstreamer-0.10/gst/rtsp-server
 %{_libdir}/libgstrtspserver-0.10.so
 %{_libdir}/pkgconfig/gst-rtsp-server-0.10.pc
-%{_datadir}/gst-rtsp/
 %{_datadir}/gir-1.0/GstRtspServer-0.10.gir
+%{_datadir}/gst-rtsp/0.10/defs/rtspserver-types.defs
+%{_datadir}/gst-rtsp/0.10/defs/rtspserver.defs
 
 %files python
 %defattr(-,root,root,-)
-%{_libdir}/python*/site-packages/gst-0.10/gst/rtspserver.so
+%{python_sitearch}/gst-0.10/gst/rtspserver.so
 
 %files vala
 %defattr(-,root,root,-)
@@ -112,6 +109,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/vala/vapi/gst-rtsp-server-0.10.vapi
 
 %changelog
+* Tue Aug 16 2011 Peter Robinson <pbrobinson at fedoraproject.org> - 0.10.8-1
+- Update to 0.10.8, cleanup spec file
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10.7-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
@@ -127,7 +127,7 @@ rm -rf $RPM_BUILD_ROOT
 * Wed Dec 16 2009 Bastien Nocera <bnocera at redhat.com> 0.10.5-1
 - Update to 0.10.5
 
-* Sat Aug  8 2009 Peter Robinson <pbrobinson at gmail.com> 0.10.4-1
+* Sat Aug  8 2009 Peter Robinson <pbrobinson at fedoraproject.org> 0.10.4-1
 - Update to 0.10.4
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10.3-2
diff --git a/sources b/sources
index b864f01..0481620 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3c2e0bf09bb66e302b6c64cb9e8f1eb6  gst-rtsp-0.10.7.tar.bz2
+b511af07000595f63c3a705946221643  gst-rtsp-0.10.8.tar.bz2
