- updated to 1.12.0

- removed outdated without_ps_pdf,eps patches; docs using them have been moved to gstreamer-docs package

diff --git a/gstreamer-eps.patch b/gstreamer-eps.patch
deleted file mode 100644 (file)
index 000e171..0000000
--- a/gstreamer-eps.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- gstreamer-0.10.1/docs/image-eps.orig       2003-10-08 16:34:06.000000000 +0200
-+++ gstreamer-0.10.1/docs/image-eps    2006-01-14 13:35:25.683403250 +0100
-@@ -1,2 +1,2 @@
--<!ENTITY image "ps">
-+<!ENTITY image "eps">
- <!ENTITY IMAGE "EPS">
---- gstreamer-0.10.1/docs/manuals.mak.orig     2005-05-02 13:47:15.000000000 +0200
-+++ gstreamer-0.10.1/docs/manuals.mak  2006-01-14 13:37:01.545394250 +0100
-@@ -11,8 +11,8 @@
- 
- # PNG's can be source or built from .fig
- PNG = $(strip $(PNG_SRC) $(FIG_SRC:.fig=.png))
--# EPS .ps files can be built from .png or .fig
--EPS = $(strip $(FIG_SRC:.fig=.ps) $(PNG_SRC:.png=.ps))
-+# EPS .eps files can be built from .png or .fig
-+EPS = $(strip $(FIG_SRC:.fig=.eps) $(PNG_SRC:.png=.eps))
- # PDF .pdf files can be built from .png or .fig
- PDF = $(strip $(FIG_SRC:.fig=.pdf) $(PNG_SRC:.png=.pdf))
- 
-@@ -140,7 +140,7 @@
-       @fig2dev -Lpng $< $@
- 
- # make ps(EPS) from fig
--$(BUILDIMAGESDIR)/%.ps: %.fig
-+$(BUILDIMAGESDIR)/%.eps: %.fig
-       @echo "Generating $@ from $<"
-       @mkdir -p $(BUILDIMAGESDIR)
-       @fig2dev -Leps $< $@
-@@ -158,7 +158,7 @@
-       @cat $< | pngtopnm | pnmtops -noturn 2> /dev/null | epstopdf --filter --outfile $@ 2> /dev/null
- 
- # make ps(EPS) from png
--$(BUILDIMAGESDIR)/%.ps: %.png
-+$(BUILDIMAGESDIR)/%.eps: %.png
-       @echo "Generating $@ from $<"
-       @mkdir -p $(BUILDIMAGESDIR)
-       @cat $< | pngtopnm | pnmtops -noturn > $@ 2> /dev/null

diff --git a/gstreamer-without_ps_pdf.patch b/gstreamer-without_ps_pdf.patch
deleted file mode 100644 (file)
index 8ba08e3..0000000
--- a/gstreamer-without_ps_pdf.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- gstreamer-0.10.1/common/m4/gst-doc.m4.orig 2005-11-27 15:19:38.000000000 +0100
-+++ gstreamer-0.10.1/common/m4/gst-doc.m4      2006-01-14 13:55:40.223307250 +0100
-@@ -8,6 +8,9 @@
-   AC_HELP_STRING([--enable-docbook],
-                  [use docbook to build documentation [default=no]]),,
-                  enable_docbook=no)
-+  AC_ARG_ENABLE(pspdf,
-+  AC_HELP_STRING([--disable-pspdf],
-+                 [disable building of documentation in PS and PDF formats]),,enable_pspdf=yes)
- 
-   have_docbook=no
- 
-@@ -100,6 +103,7 @@
-     dnl check if we can generate PS
-     if test "x$HAVE_DOCBOOK2PS" = "xyes" && \
-        test "x$enable_docbook" = "xyes" && \
-+       test "x$enable_pspdf" = "xyes" && \
-        test "x$HAVE_XMLLINT" = "xyes" && \
-        test "x$HAVE_JADETEX" = "xyes" && \
-        test "x$HAVE_FIG2DEV_EPS" = "xyes" && \

diff --git a/gstreamer.spec b/gstreamer.spec
index a0178b67e684ca52111f1189ca3f950ed47ce4ea..80b106509669692cb4c2237fa1a33bbf3aa4b8be 100644 (file)
--- a/gstreamer.spec
+++ b/gstreamer.spec
@@ -4,38 +4,34 @@
 Summary:       GStreamer Streaming-media framework runtime
 Summary(pl.UTF-8):     GStreamer - biblioteki środowiska do obróbki strumieni
 Name:          gstreamer
 Summary:       GStreamer Streaming-media framework runtime
 Summary(pl.UTF-8):     GStreamer - biblioteki środowiska do obróbki strumieni
 Name:          gstreamer

-Version:       1.10.2
+Version:       1.12.0

 Release:       1
 License:       LGPL v2+
 Group:         Libraries
 Source0:       https://gstreamer.freedesktop.org/src/gstreamer/%{name}-%{version}.tar.xz
 Release:       1
 License:       LGPL v2+
 Group:         Libraries
 Source0:       https://gstreamer.freedesktop.org/src/gstreamer/%{name}-%{version}.tar.xz

-# Source0-md5: 0d289e5bcec6353e6540ddb75b7d371b
-Patch0:                %{name}-without_ps_pdf.patch
-Patch1:                %{name}-eps.patch
-Patch2:                %{name}-inspect-rpm-format.patch
+# Source0-md5: 8f76b6b5e4b3307e505bd6ab9304dd03
+Patch0:                %{name}-inspect-rpm-format.patch

 URL:           https://gstreamer.freedesktop.org/
 BuildRequires: autoconf >= 2.69
 BuildRequires: automake >= 1:1.14
 BuildRequires: bison >= 1.875
 URL:           https://gstreamer.freedesktop.org/
 BuildRequires: autoconf >= 2.69
 BuildRequires: automake >= 1:1.14
 BuildRequires: bison >= 1.875

-BuildRequires: docbook-dtd30-sgml

 BuildRequires: docbook-dtd412-xml
 BuildRequires: docbook-dtd412-xml

-BuildRequires: docbook-utils >= 0.6.10
+BuildRequires: elfutils-devel

 BuildRequires: flex >= 2.5.31
 BuildRequires: gettext-tools >= 0.17
 BuildRequires: glib2-devel >= 1:2.40.0
 BuildRequires: glibc-misc
 BuildRequires: flex >= 2.5.31
 BuildRequires: gettext-tools >= 0.17
 BuildRequires: glib2-devel >= 1:2.40.0
 BuildRequires: glibc-misc

-BuildRequires: gnome-doc-tools

 BuildRequires: gobject-introspection-devel >= 1.31.1
 BuildRequires: gtk-doc >= 1.12
 BuildRequires: libcap-devel
 BuildRequires: libtool >= 2:2.2.6
 BuildRequires: gobject-introspection-devel >= 1.31.1
 BuildRequires: gtk-doc >= 1.12
 BuildRequires: libcap-devel
 BuildRequires: libtool >= 2:2.2.6

-BuildRequires: nasm
+%ifarch %{ix86} %{x8664} %{arm} hppa ia64 mips ppc ppc64 sh
+BuildRequires: libunwind-devel
+%endif

 BuildRequires: perl-base
 BuildRequires: pkgconfig >= 1:0.9.0
 BuildRequires: python >= 2.1
 BuildRequires: tar >= 1:1.22
 BuildRequires: perl-base
 BuildRequires: pkgconfig >= 1:0.9.0
 BuildRequires: python >= 2.1
 BuildRequires: tar >= 1:1.22

-BuildRequires: transfig
-BuildRequires: xmlto

 BuildRequires: xz
 Requires:      glib2 >= 1:2.40.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 BuildRequires: xz
 Requires:      glib2 >= 1:2.40.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)


@@ -119,8 +115,6 @@ gst-launch.
 %prep
 %setup -q
 %patch0 -p1
 %prep
 %setup -q
 %patch0 -p1

-%patch1 -p1
-%patch2 -p1

 
 %build
 # po/Makefile.in.in is modified
 
 %build
 # po/Makefile.in.in is modified


@@ -132,10 +126,8 @@ gst-launch.
 %{__automake}
 %configure \
        --disable-examples \
 %{__automake}
 %configure \
        --disable-examples \

-       --disable-pspdf \

        --disable-silent-rules \
        --disable-tests \
        --disable-silent-rules \
        --disable-tests \

-       --enable-docbook \

        --enable-gtk-doc \
        --with-html-dir=%{_gtkdocdir} \
        --enable-static
        --enable-gtk-doc \
        --with-html-dir=%{_gtkdocdir} \
        --enable-static


@@ -144,15 +136,10 @@ gst-launch.
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %install
 rm -rf $RPM_BUILD_ROOT

-install -d $RPM_BUILD_ROOT{%{_docdir}/%{name}-devel-%{version},%{rpmlibdir}}

 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 

-mv $RPM_BUILD_ROOT%{_docdir}/%{name}-{%{vmajor},%{version}}
-mv $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/{faq,manual,pwg} \
-       $RPM_BUILD_ROOT%{_docdir}/%{name}-devel-%{version}
-

 %find_lang %{name} --all-name --with-gnome
 
 # no *.la for modules - shut up check files
 %find_lang %{name} --all-name --with-gnome
 
 # no *.la for modules - shut up check files


@@ -204,7 +191,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libgstcontroller-%{vmajor}.so
 %attr(755,root,root) %{_libdir}/libgstnet-%{vmajor}.so
 %attr(755,root,root) %{_libdir}/libgstreamer-%{vmajor}.so
 %attr(755,root,root) %{_libdir}/libgstcontroller-%{vmajor}.so
 %attr(755,root,root) %{_libdir}/libgstnet-%{vmajor}.so
 %attr(755,root,root) %{_libdir}/libgstreamer-%{vmajor}.so

-%{_docdir}/%{name}-devel-%{version}

 %{_gstincludedir}
 %{_pkgconfigdir}/gstreamer-%{vmajor}.pc
 %{_pkgconfigdir}/gstreamer-base-%{vmajor}.pc
 %{_gstincludedir}
 %{_pkgconfigdir}/gstreamer-%{vmajor}.pc
 %{_pkgconfigdir}/gstreamer-base-%{vmajor}.pc


@@ -236,5 +222,5 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{bash_compdir}/gst-inspect-1.0
 %{bash_compdir}/gst-launch-1.0
 %defattr(644,root,root,755)
 %{bash_compdir}/gst-inspect-1.0
 %{bash_compdir}/gst-launch-1.0

+%attr(755,root,root) %{_gstlibdir}/gst-completion-helper

 %attr(755,root,root) %{_datadir}/bash-completion/helpers/gst
 %attr(755,root,root) %{_datadir}/bash-completion/helpers/gst

-%attr(755,root,root) %{_datadir}/bash-completion/helpers/gst-completion-helper-1.0