[farstream] Revert to old farstream source

Dan Mashal vicodan at fedoraproject.org
Wed May 1 23:41:06 UTC 2013


commit 934f615c02f3ee94c37b33f9d25c4d676741ed08
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Wed May 1 16:40:23 2013 -0700

    Revert to old farstream source

 farstream.spec |   87 ++++++++++++++++++++++++++++++++++++--------------------
 sources        |    2 +-
 2 files changed, 57 insertions(+), 32 deletions(-)
---
diff --git a/farstream.spec b/farstream.spec
index cfbcb21..a1b4240 100644
--- a/farstream.spec
+++ b/farstream.spec
@@ -4,23 +4,24 @@
 %define gst_plugins_base_ver 0.10.33
 
 Name:           farstream
-Version:        0.2.2
-Release:        1%{?dist}
+Version:        0.1.2
+Release:        5%{?dist}
 Summary:        Libraries for videoconferencing
 
 License:        LGPLv2+
 URL:            http://www.freedesktop.org/wiki/Software/Farstream
 Source0:        http://freedesktop.org/software/%{name}/releases/%{name}/%{name}-%{version}.tar.gz
-
-BuildRequires:  libnice-devel 
-BuildRequires:  gstreamer-devel 
-BuildRequires:  gstreamer-plugins-base-devel
-BuildRequires:  gstreamer1-devel
-#BuildRequires:  gupnp-igd-devel
-#BuildRequires:  gobject-introspection-devel
-#BuildRequires:  python-devel
-#BuildRequires:  gstreamer-python-devel
-#BuildRequires:  pygobject2-devel
+Patch0:         farstream-prefer-vp8.patch
+Patch1:         0001-Gtk-doc-tags-belong-after-the-description.patch
+
+BuildRequires:  libnice-devel >= 0.1.0
+BuildRequires:  gstreamer-devel >= %{gst_ver}
+BuildRequires:  gstreamer-plugins-base-devel >= %{gst_plugins_base_ver}
+BuildRequires:  gupnp-igd-devel
+BuildRequires:  gobject-introspection-devel
+BuildRequires:  python-devel
+BuildRequires:  gstreamer-python-devel
+BuildRequires:  pygobject2-devel
 
 Requires:       gstreamer-plugins-good >= 0.10.29
 Requires:       gstreamer-plugins-bad-free >= 0.10.23
@@ -69,20 +70,21 @@ developing applications that use %{name}.
 
 %prep
 %setup -q
+%patch0 -p1 -b .vp8
+%patch1 -p1
 
 
 %build
-#%configure                                                              \
-#  --with-package-name='Fedora Farstream package'                        \
-#  --with-package-origin='http://download.fedoraproject.org'             \
-#  --disable-static
-%configure -with-aclocal --with-automake --with-autoheader --with-autoconf --disable-debug --disable-valgrind --enable-gtk-doc-html --disable-static --disable-libtool-lock
-
-make %{?_smp_mflags} V=1
+%configure                                                              \
+  --with-package-name='Fedora Farstream package'                        \
+  --with-package-origin='http://download.fedoraproject.org'             \
+  --disable-static
+make %{?_smp_mflags}
 
 
 %install
-make DESTDIR=%{buildroot} install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 
@@ -94,21 +96,44 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 %files
 %doc COPYING NEWS AUTHORS
-%{_datadir}/gtk-doc/html/farstream*
-%{_libdir}/*.so*
-%{_datadir}/farstream*
+%{_libdir}/*.so.*
+%dir %{_libdir}/%{name}-0.1
+%{_libdir}/%{name}-0.1/libmulticast-transmitter.so
+%{_libdir}/%{name}-0.1/libnice-transmitter.so
+%{_libdir}/%{name}-0.1/librawudp-transmitter.so
+%{_libdir}/%{name}-0.1/libshm-transmitter.so
+%{_libdir}/gstreamer-0.10/libfsfunnel.so
+%{_libdir}/gstreamer-0.10/libfsmsnconference.so
+%{_libdir}/gstreamer-0.10/libfsrawconference.so
+%{_libdir}/gstreamer-0.10/libfsrtcpfilter.so
+%{_libdir}/gstreamer-0.10/libfsrtpconference.so
+%{_libdir}/gstreamer-0.10/libfsvideoanyrate.so
+%{_libdir}/girepository-1.0/Farstream-0.1.typelib
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/0.1
+%dir %{_datadir}/%{name}/0.1/fsrtpconference
+%dir %{_datadir}/%{name}/0.1/fsrawconference
+%{_datadir}/%{name}/0.1/fsrtpconference/default-codec-preferences
+%{_datadir}/%{name}/0.1/fsrtpconference/default-element-properties
+%{_datadir}/%{name}/0.1/fsrawconference/default-element-properties
+
+
+%files python
+%{python_sitearch}/farstream.so
+
 
 %files devel
-%{_includedir}/farstream-0.2
-%{_libdir}/gstreamer-1.0/*.so
-%{_libdir}/farstream-0.2/*.so
-%{_libdir}/pkgconfig/*.pc
+%{_libdir}/libfarstream-0.1.so
+%{_libdir}/pkgconfig/%{name}-0.1.pc
+%{_includedir}/%{name}-0.1/%{name}/
+%{_datadir}/gir-1.0/Farstream-0.1.gir
+%{_datadir}/gtk-doc/html/%{name}-libs-0.10/
+%{_datadir}/gtk-doc/html/%{name}-plugins-0.1/
+
 
 %changelog
-* Wed Mar 27 2013 Dan Mashal <dan.mashal at fedoraproject.org> - 0.2.2-1
-- Took over maintainership
-- Updated to latest upstream release
-- Fixed Rawhide builds
+* Thu Apr 18 2013 Debarshi Ray <rishi at fedoraproject.org> - 0.1.2-5
+- Fix build failure due broken annotations.
 
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
diff --git a/sources b/sources
index ecf41d8..3f95821 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-01c20c1ed014ad4e18e55f1f6caf7877  farstream-0.2.2.tar.gz
+5d6e561b3688d0d0c8906fec4f356df3  farstream-0.1.2.tar.gz


More information about the scm-commits mailing list