commit 80fc8b97a0ea816f91137386623f15afdcca4931
Author: Jakub Bogusz <[email protected]>
Date:   Sun Feb 24 13:49:29 2013 +0100

    - updated to 0.10.0; added gst-* packages
    - added vala patch (no Vala binding for gst-legacy library, so don't try to 
build it)

 gupnp-dlna-vala.patch |  13 +++
 gupnp-dlna.spec       | 233 ++++++++++++++++++++++++++++++++++++++++++++------
 2 files changed, 220 insertions(+), 26 deletions(-)
---
diff --git a/gupnp-dlna.spec b/gupnp-dlna.spec
index c4de30c..cf00c6f 100644
--- a/gupnp-dlna.spec
+++ b/gupnp-dlna.spec
@@ -2,37 +2,43 @@
 # Conditional build:
 %bcond_without apidocs         # do not build and package API docs
 %bcond_without vala            # Vala binding
+%bcond_without gstreamer       # GStreamer 1.0 metadata backend
+%bcond_with    gstreamer0_10   # GStreamer 0.10 metadata backend
 #
 Summary:       GUPnP utility library to ease tasks related to DLNA
 Summary(pl.UTF-8):     Biblioteka narzędziowa GUPnP ułatwiająca zadania 
związane z DLNA
 Name:          gupnp-dlna
-# note: 0.8.x is stable, 0.9.x unstable
-Version:       0.8.0
+# note: 0.10.x is stable, 0.11.x unstable
+Version:       0.10.0
 Release:       1
 Epoch:         1
 License:       LGPL v2+
 Group:         Libraries
-Source0:       
http://ftp.gnome.org/pub/GNOME/sources/gupnp-dlna/0.8/%{name}-%{version}.tar.xz
-# Source0-md5: 84fc9815c13fa7b6cfc15b9d6ce00415
+Source0:       
http://ftp.gnome.org/pub/GNOME/sources/gupnp-dlna/0.10/%{name}-%{version}.tar.xz
+# Source0-md5: 9555c5d96ffcbcf1fcf1fac69f516bb9
+Patch0:                %{name}-vala.patch
 URL:           http://gupnp.org/
 BuildRequires: autoconf >= 2.63
 BuildRequires: automake >= 1:1.11
 BuildRequires: docbook-dtd412-xml
-BuildRequires: glib2-devel >= 1:2.24
+BuildRequires: glib2-devel >= 1:2.34
 BuildRequires: gobject-introspection-devel >= 0.6.4
+%if %{with gstreamer0_10}
+BuildRequires: gstreamer0.10-devel >= 0.10.36
+BuildRequires: gstreamer0.10-plugins-base-devel >= 0.10.36
+%endif
+%if %{with gstreamer}
 BuildRequires: gstreamer-devel >= 1.0.0
 BuildRequires: gstreamer-plugins-base-devel >= 1.0.0
+%endif
 BuildRequires: gtk-doc >= 1.11
 BuildRequires: libtool >= 2:2.2
 BuildRequires: libxml2-devel >= 1:2.5.0
 BuildRequires: pkgconfig
 BuildRequires: tar >= 1:1.22
 %{?with_vala:BuildRequires:    vala >= 2:0.18}
-%{?with_vala:BuildRequires:    vala-gupnp >= 0.10}
 BuildRequires: xz
-# no --disable-vala option; build fails if vala is present, but vala-gupnp is 
not
-%{!?with_vala:BuildConflicts:  vala}
-Requires:      glib2 >= 1:2.24
+Requires:      glib2 >= 1:2.34
 Requires:      gstreamer >= 1.0.0
 Requires:      gstreamer-plugins-base >= 1.0.0
 Requires:      libxml2 >= 1:2.5.0
@@ -54,7 +60,7 @@ Summary:      Header files for GUPnP DLNA library
 Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki GUPnP DLNA
 Group:         Development/Libraries
 Requires:      %{name} = %{epoch}:%{version}-%{release}
-Requires:      glib2-devel >= 1:2.24
+Requires:      glib2-devel >= 1:2.34
 Requires:      gstreamer-devel >= 1.0.0
 Requires:      gstreamer-plugins-base-devel >= 1.0.0
 Requires:      libxml2-devel >= 1:2.5.0
@@ -95,7 +101,6 @@ Summary(pl.UTF-8):   Wiązanie języka Vala do biblioteki 
GUPnP DLNA
 Group:         Development/Libraries
 Requires:      %{name}-devel = %{epoch}:%{version}-%{release}
 Requires:      vala >= 2:0.18
-Requires:      vala-gupnp >= 0.10
 
 %description -n vala-gupnp-dlna
 Vala binding for GUPnP DLNA library.
@@ -103,8 +108,117 @@ Vala binding for GUPnP DLNA library.
 %description -n vala-gupnp-dlna -l pl.UTF-8
 Wiązanie języka Vala do biblioteki GUPnP DLNA.
 
+%package gst
+Summary:       GStreamer-specific GUPnP-DLNA library
+Summary(pl.UTF-8):     Biblioteka GUPnP-DLNA dla GStreamera
+Group:         Libraries
+Requires:      %{name} = %{epoch}:%{version}-%{release}
+Requires:      gstreamer >= 1.0.0
+Requires:      gstreamer-plugins-base >= 1.0.0
+
+%description gst
+GStreamer-specific GUPnP-DLNA library.
+
+%description gst -l devel
+Biblioteka GUPnP-DLNA dla GStreamera.
+
+%package gst-devel
+Summary:       Header file for GStreamer-specific GUPnP-DLNA library
+Summary(pl.UTF-8):     Plik nagłówkowy biblioteki GUPnP-DLNA dla GStreamera
+Group:         Development/Libraries
+Requires:      %{name}-devel = %{epoch}:%{version}-%{release}
+Requires:      %{name}-gst = %{epoch}:%{version}-%{release}
+Requires:      gstreamer-devel >= 1.0.0
+Requires:      gstreamer-plugins-base-devel >= 1.0.0
+
+%description gst-devel
+Header file for GStreamer-specific GUPnP-DLNA library.
+
+%description gst-devel -l pl.UTF-8
+Plik nagłówkowy biblioteki GUPnP-DLNA dla GStreamera.
+
+%package gst-static
+Summary:       Static GStreamer-specific GUPnP-DLNA library
+Summary(pl.UTF-8):     Statyczna biblioteka GUPnP-DLNA dla GStreamera
+Group:         Development/Libraries
+Requires:      %{name}-gst-devel = %{epoch}:%{version}-%{release}
+
+%description gst-static
+Static GStreamer-specific GUPnP-DLNA library.
+
+%description gst-static -l pl.UTF-8
+Statyczna biblioteka GUPnP-DLNA dla GStreamera.
+
+%package gst-apidocs
+Summary:       GStreamer-specific GUPnP-DLNA library API documentation
+Summary(pl.UTF-8):     Dokumentacja API biblioteki GUPnP-DLNA dla GStreamera
+Group:         Documentation
+Requires:      gtk-doc-common
+
+%description gst-apidocs
+GStreamer-specific GUPnP-DLNA library API documentation.
+
+%description gst-apidocs -l pl.UTF-8
+Dokumentacja API biblioteki GUPnP-DLNA dla GStreamera.
+
+%package -n vala-gupnp-dlna-gst
+Summary:       Vala binding for GStreamer-specific GUPnP-DLNA library
+Summary(pl.UTF-8):     Wiązanie języka Vala do biblioteki GUPnP-DLNA dla 
GStreamera
+Group:         Development/Libraries
+Requires:      %{name}-gst-devel = %{epoch}:%{version}-%{release}
+Requires:      vala >= 2:0.18
+Requires:      vala-gupnp-dlna-gst = %{epoch}:%{version}-%{release}
+
+%description -n vala-gupnp-dlna-gst
+Vala binding for GStreamer-specific GUPnP-DLNA library.
+
+%description -n vala-gupnp-dlna-gst -l pl.UTF-8
+Wiązanie języka Vala do biblioteki GUPnP-DLNA dla GStreamera.
+
+%package gst-legacy
+Summary:       GStreamer 0.10-specific GUPnP-DLNA library
+Summary(pl.UTF-8):     Biblioteka GUPnP-DLNA dla GStreamera 0.10
+Group:         Libraries
+Requires:      %{name} = %{epoch}:%{version}-%{release}
+Requires:      gstreamer0.10 >= 0.10.36
+Requires:      gstreamer0.10-plugins-base >= 0.10.36
+
+%description gst-legacy
+GStreamer 0.10-specific GUPnP-DLNA library.
+
+%description gst-legacy -l devel
+Biblioteka GUPnP-DLNA dla GStreamera 0.10.
+
+%package gst-legacy-devel
+Summary:       Header file for GStreamer 0.10-specific GUPnP-DLNA library
+Summary(pl.UTF-8):     Plik nagłówkowy biblioteki GUPnP-DLNA dla GStreamera 
0.10
+Group:         Development/Libraries
+Requires:      %{name}-devel = %{epoch}:%{version}-%{release}
+Requires:      %{name}-gst-legacy = %{epoch}:%{version}-%{release}
+Requires:      gstreamer-devel >= 1.0.0
+Requires:      gstreamer-plugins-base-devel >= 1.0.0
+
+%description gst-legacy-devel
+Header file for GStreamer-specific GUPnP-DLNA library.
+
+%description gst-legacy-devel -l pl.UTF-8
+Plik nagłówkowy biblioteki GUPnP-DLNA dla GStreamera.
+
+%package gst-legacy-static
+Summary:       Static GStreamer-specific GUPnP-DLNA library
+Summary(pl.UTF-8):     Statyczna biblioteka GUPnP-DLNA dla GStreamera
+Group:         Development/Libraries
+Requires:      %{name}-gst-legacy-devel = %{epoch}:%{version}-%{release}
+
+%description gst-legacy-static
+Static GStreamer-specific GUPnP-DLNA library.
+
+%description gst-legacy-static -l pl.UTF-8
+Statyczna biblioteka GUPnP-DLNA dla GStreamera.
+
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{__gtkdocize}
@@ -114,8 +228,10 @@ Wiązanie języka Vala do biblioteki GUPnP DLNA.
 %{__autoheader}
 %{__automake}
 %configure \
-       --disable-silent-rules \
        %{?with_apidocs:--enable-gtk-doc} \
+       %{!?with_gstreamer:--disable-gstreamer-metadata-backend} \
+       %{?with_gstreamer0_10:--enable-legacy-gstreamer-metadata-backend} \
+       --disable-silent-rules \
        --with-html-dir=%{_gtkdocdir}
 
 %{__make}
@@ -127,8 +243,10 @@ rm -rf $RPM_BUILD_ROOT
        DESTDIR=$RPM_BUILD_ROOT
 
 %{!?with_apidocs:%{__rm} -r $RPM_BUILD_ROOT%{_gtkdocdir}}
+%{?with_gstreamer:%{__rm} $RPM_BUILD_ROOT%{_libdir}/gupnp-dlna/libgstreamer.la}
+%{?with_gstreamer0_10:%{__rm} 
$RPM_BUILD_ROOT%{_libdir}/gupnp-dlna/libgstreamer-legacy.la}
 # obsoleted by pkg-config
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libgupnp-dlna-1.1.la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libgupnp-dlna-*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -139,33 +257,96 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README TODO
-%attr(755,root,root) %{_bindir}/gupnp-dlna-info-1.1
-%attr(755,root,root) %{_bindir}/gupnp-dlna-ls-profiles-1.1
-%attr(755,root,root) %{_libdir}/libgupnp-dlna-1.1.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgupnp-dlna-1.1.so.3
-%{_libdir}/girepository-1.0/GUPnPDLNA-1.1.typelib
-%{_datadir}/gupnp-dlna
+%attr(755,root,root) %{_bindir}/gupnp-dlna-info-2.0
+%attr(755,root,root) %{_bindir}/gupnp-dlna-ls-profiles-2.0
+%attr(755,root,root) %{_libdir}/libgupnp-dlna-2.0.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgupnp-dlna-2.0.so.3
+%dir %{_libdir}/gupnp-dlna
+%{_libdir}/girepository-1.0/GUPnPDLNA-2.0.typelib
+%{_datadir}/gupnp-dlna-2.0
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libgupnp-dlna-1.1.so
-%{_datadir}/gir-1.0/GUPnPDLNA-1.1.gir
-%{_includedir}/gupnp-dlna-1.1
-%{_pkgconfigdir}/gupnp-dlna-1.1.pc
+%attr(755,root,root) %{_libdir}/libgupnp-dlna-2.0.so
+%{_datadir}/gir-1.0/GUPnPDLNA-2.0.gir
+%dir %{_includedir}/gupnp-dlna-2.0
+%dir %{_includedir}/gupnp-dlna-2.0/libgupnp-dlna
+%{_includedir}/gupnp-dlna-2.0/libgupnp-dlna/gupnp-dlna.h
+%{_includedir}/gupnp-dlna-2.0/libgupnp-dlna/gupnp-dlna-*information.h
+%{_includedir}/gupnp-dlna-2.0/libgupnp-dlna/gupnp-dlna-g-values.h
+%{_includedir}/gupnp-dlna-2.0/libgupnp-dlna/gupnp-dlna-profile*.h
+%{_includedir}/gupnp-dlna-2.0/libgupnp-dlna/gupnp-dlna-restriction.h
+%{_includedir}/gupnp-dlna-2.0/libgupnp-dlna/gupnp-dlna-value-list.h
+%{_includedir}/gupnp-dlna-2.0/libgupnp-dlna/gupnp-dlna-values.h
+%{_includedir}/gupnp-dlna-2.0/libgupnp-dlna/metadata
+%{_pkgconfigdir}/gupnp-dlna-2.0.pc
+%{_pkgconfigdir}/gupnp-dlna-metadata-2.0.pc
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/libgupnp-dlna-1.1.a
+%{_libdir}/libgupnp-dlna-2.0.a
 
 %if %{with apidocs}
 %files apidocs
 %defattr(644,root,root,755)
 %{_gtkdocdir}/gupnp-dlna
+%{_gtkdocdir}/gupnp-dlna-metadata
 %endif
 
 %if %{with vala}
 %files -n vala-gupnp-dlna
 %defattr(644,root,root,755)
-%{_datadir}/vala/vapi/gupnp-dlna-1.1.deps
-%{_datadir}/vala/vapi/gupnp-dlna-1.1.vapi
+%{_datadir}/vala/vapi/gupnp-dlna-2.0.deps
+%{_datadir}/vala/vapi/gupnp-dlna-2.0.vapi
+%endif
+
+%if %{with gstreamer}
+%files gst
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libgupnp-dlna-gst-2.0.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgupnp-dlna-gst-2.0.so.3
+%{_libdir}/girepository-1.0/GUPnPDLNAGst-2.0.typelib
+%attr(755,root,root) %{_libdir}/gupnp-dlna/libgstreamer.so
+
+%files gst-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libgupnp-dlna-gst-2.0.so
+%{_includedir}/gupnp-dlna-2.0/libgupnp-dlna/gupnp-dlna-gst-utils.h
+%{_datadir}/gir-1.0/GUPnPDLNAGst-2.0.gir
+%{_pkgconfigdir}/gupnp-dlna-gst-2.0.pc
+
+%files gst-static
+%defattr(644,root,root,755)
+%{_libdir}/libgupnp-dlna-gst-2.0.a
+
+%if %{with apidocs}
+%files gst-apidocs
+%defattr(644,root,root,755)
+%{_gtkdocdir}/gupnp-dlna-gst
+%endif
+
+%if %{with vala}
+%files -n vala-gupnp-dlna-gst
+%defattr(644,root,root,755)
+%{_datadir}/vala/vapi/gupnp-dlna-gst-2.0.deps
+%{_datadir}/vala/vapi/gupnp-dlna-gst-2.0.vapi
+%endif
+%endif
+
+%if %{with gstreamer0_10}
+%files gst-legacy
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libgupnp-dlna-gst-legacy-2.0.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgupnp-dlna-gst-legacy-2.0.so.3
+%attr(755,root,root) %{_libdir}/gupnp-dlna/libgstreamer-legacy.so
+
+%files gst-legacy-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libgupnp-dlna-gst-legacy-2.0.so
+%{_includedir}/gupnp-dlna-2.0/libgupnp-dlna/gupnp-dlna-gst-legacy-utils.h
+%{_pkgconfigdir}/gupnp-dlna-gst-legacy-2.0.pc
+
+%files gst-legacy-static
+%defattr(644,root,root,755)
+%{_libdir}/libgupnp-dlna-gst-legacy-2.0.a
 %endif
diff --git a/gupnp-dlna-vala.patch b/gupnp-dlna-vala.patch
new file mode 100644
index 0000000..7de81e9
--- /dev/null
+++ b/gupnp-dlna-vala.patch
@@ -0,0 +1,13 @@
+--- gupnp-dlna-0.10.0/vala/Makefile.am.orig    2013-02-12 13:49:34.000000000 
+0100
++++ gupnp-dlna-0.10.0/vala/Makefile.am 2013-02-24 12:55:53.343442600 +0100
+@@ -58,10 +58,5 @@
+       gupnp-dlna-gst-2.0-custom.vala
+ endif
+ 
+-if GSTREAMER_LEGACY_METADATA_BACKEND_ENABLED
+-vapi_DATA += \
+-      gupnp-dlna-gst-legacy-2.0.vapi \
+-      $(srcdir)/gupnp-dlna-gst-legacy-2.0.deps
+-endif
+ endif
+ endif
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gupnp-dlna.git/commitdiff/80fc8b97a0ea816f91137386623f15afdcca4931

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to