Hello community,
here is the log from the commit of package gstreamer-plugins-qt for
openSUSE:Factory checked in at 2014-09-03 18:22:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gstreamer-plugins-qt (Old)
and /work/SRC/openSUSE:Factory/.gstreamer-plugins-qt.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gstreamer-plugins-qt"
Changes:
--------
---
/work/SRC/openSUSE:Factory/gstreamer-plugins-qt/gstreamer-plugins-qt.changes
2014-07-25 09:09:06.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.gstreamer-plugins-qt.new/gstreamer-plugins-qt.changes
2014-09-03 19:55:43.000000000 +0200
@@ -1,0 +2,7 @@
+Wed Aug 27 21:07:35 UTC 2014 - hrvoje.sen...@gmail.com
+
+- Merge all subpackage to gstreamer-plugins-qt and
+ gstreamer-plugins-qt-devel subpackage to fix unresolvable in Factory
+- Obsolete old packages (and 0.10 variant)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gstreamer-plugins-qt.spec ++++++
--- /var/tmp/diff_new_pack.FUCaN2/_old 2014-09-03 19:55:44.000000000 +0200
+++ /var/tmp/diff_new_pack.FUCaN2/_new 2014-09-03 19:55:44.000000000 +0200
@@ -47,7 +47,14 @@
BuildRequires: pkgconfig(gstreamer-pbutils-1.0)
BuildRequires: pkgconfig(gstreamer-plugins-base-1.0)
BuildRequires: pkgconfig(gstreamer-video-1.0)
-Conflicts: gstreamer-0_10-plugins-qt
+Obsoletes: gstreamer-0_10-plugins-qt
+Obsoletes: libQtGStreamer-0_10-0
+Provides: libQtGLib-2_0-0 = %{version}
+# FIXME drop the '<' on next version bump
+Obsoletes: libQtGLib-2_0-0 <= %{version}
+Provides: libQtGStreamer-1.0-0 = %{version}
+# FIXME drop the '<' on next version bump
+Obsoletes: libQtGStreamer-1.0-0 <= %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -67,14 +74,13 @@
Summary: Include files and libraries mandatory for development
Group: Development/Libraries/C and C++
Requires: %{name} = %{version}
-Requires: libQtGLib-devel = %{version}
-Requires: libQtGStreamer-%{gstnum}-%{gstmin} = %{version}
+Requires: boost-devel
Requires: pkgconfig(QtCore)
Requires: pkgconfig(QtDeclarative)
Requires: pkgconfig(QtGui)
-Conflicts: gstreamer-0_10-plugins-qt-devel
-Provides: libQtGStreamer-%{gstnum}-devel = %{version}
-Obsoletes: libQtGStreamer-%{gstnum}-devel < %{version}
+Provides: libQtGLib-devel = %{version}
+# FIXME drop the '<' on next version bump
+Obsoletes: libQtGLib-devel <= %{version}
%description devel
GStreamer is a streaming-media framework, based on graphs of filters
@@ -87,47 +93,6 @@
This package contains development files and headers for the C++/Qt
bindings for GStreamer.
-%package -n libQtGLib-devel
-Summary: C++/Qt bindings for GLib
-Group: Development/Libraries/C and C++
-Requires: boost-devel
-Requires: libQtGLib-%{glibnum}-%{glibmin} = %{version}
-Requires: pkgconfig(QtCore)
-
-%description -n libQtGLib-devel
-GLib is a general-purpose utility library, which provides many useful
-data types, macros, type conversions, string utilities, file utilities,
-a main loop abstraction, and so on.
-
-%package -n libQtGLib-%{glibnum}-%{glibmin}
-Summary: C++/Qt bindings for GLib
-Group: System/Libraries
-
-%description -n libQtGLib-%{glibnum}-%{glibmin}
-GLib is a general-purpose utility library, which provides many useful
-data types, macros, type conversions, string utilities, file utilities,
-a main loop abstraction, and so on.
-
-This package contains C++/Qt bindings for GLib.
-
-This package contains development files and headers for the C++/Qt
-bindings for GLib.
-
-%package -n libQtGStreamer-%{gstnum}-%{gstmin}
-Summary: C++/Qt bindings for GStreamer
-Group: Productivity/Multimedia/Other
-Requires: %{name}
-
-%description -n libQtGStreamer-%{gstnum}-%{gstmin}
-GStreamer is a streaming-media framework, based on graphs of filters
-which operate on media data. Applications using this library can do
-anything from real-time sound processing to playing videos, and just
-about anything else media-related. Its plug-in-based architecture
-means that new data types or processing capabilities can be added by
-installing new plug-ins.
-
-This package contains C++/Qt bindings for GStreamer.
-
%build
%cmake_kde4 -d build -- -DQTGSTREAMER_STATIC=OFF -DQTGSTREAMER_EXAMPLES=OFF
%make_jobs
@@ -135,11 +100,8 @@
%install
%kde4_makeinstall -C build
-%post -n libQtGLib-%{glibnum}-%{glibmin} -p /sbin/ldconfig
-%postun -n libQtGLib-%{glibnum}-%{glibmin} -p /sbin/ldconfig
-
-%post -n libQtGStreamer-%{gstnum}-%{gstmin} -p /sbin/ldconfig
-%postun -n libQtGStreamer-%{gstnum}-%{gstmin} -p /sbin/ldconfig
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
%files
%defattr(-,root,root)
@@ -147,33 +109,22 @@
%dir %{_libdir}/qt4/
%dir %{_libdir}/qt4/plugins/
%dir %{_libdir}/qt4/plugins/imports/
-%{_libdir}/qt4/plugins/imports/QtGStreamer/
-%{_libdir}/gstreamer-%{gstnum}/libgstqtvideosink.so
-
-%files -n libQtGLib-%{glibnum}-%{glibmin}
-%defattr(-,root,root)
%{_libdir}/libQtGLib-2.0.so.*
-
-%files -n libQtGLib-devel
-%defattr(-,root,root)
-%dir %{_includedir}/QtGStreamer/
-%{_includedir}/QtGStreamer/QGlib/
-%{_libdir}/cmake/QtGStreamer/
-%{_libdir}/libQtGLib-2.0.so
-%{_libdir}/pkgconfig/QtGLib-2.0.pc
-
-%files -n libQtGStreamer-%{gstnum}-%{gstmin}
-%defattr(-,root,root)
%{_libdir}/libQtGStreamer-%{gstnum}.so.*
%{_libdir}/libQtGStreamerUi-%{gstnum}.so.*
%{_libdir}/libQtGStreamerUtils-%{gstnum}.so.*
+%{_libdir}/qt4/plugins/imports/QtGStreamer/
+%{_libdir}/gstreamer-%{gstnum}/libgstqtvideosink.so
%files devel
%defattr(-,root,root)
-%{_includedir}/QtGStreamer/QGst/
+%{_libdir}/cmake/QtGStreamer/
+%{_includedir}/QtGStreamer/
+%{_libdir}/libQtGLib-2.0.so
%{_libdir}/libQtGStreamer-%{gstnum}.so
%{_libdir}/libQtGStreamerUi-%{gstnum}.so
%{_libdir}/libQtGStreamerUtils-%{gstnum}.so
+%{_libdir}/pkgconfig/QtGLib-2.0.pc
%{_libdir}/pkgconfig/QtGStreamer-%{gstnum}.pc
%{_libdir}/pkgconfig/QtGStreamerUi-%{gstnum}.pc
%{_libdir}/pkgconfig/QtGStreamerUtils-%{gstnum}.pc
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
