Hello community,
here is the log from the commit of package libqt5-qtmultimedia for
openSUSE:Factory checked in at 2014-02-18 16:17:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtmultimedia (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qtmultimedia.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtmultimedia"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt5-qtmultimedia/libqt5-qtmultimedia.changes
2013-12-19 12:41:22.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.libqt5-qtmultimedia.new/libqt5-qtmultimedia.changes
2014-02-18 16:17:51.000000000 +0100
@@ -1,0 +2,13 @@
+Mon Feb 10 11:26:58 UTC 2014 - [email protected]
+
+- Install LICENSE files to %doc
+
+-------------------------------------------------------------------
+Wed Feb 5 17:07:24 UTC 2014 - [email protected]
+
+- Update to 5.2.1:
+ * For more details please see:
+ http://blog.qt.digia.com/blog/2014/02/05/qt-5-2-1-released/
+- Remove libtool archives from packages
+
+-------------------------------------------------------------------
Old:
----
qtmultimedia-opensource-src-5.2.0.tar.xz
New:
----
qtmultimedia-opensource-src-5.2.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtmultimedia.spec ++++++
--- /var/tmp/diff_new_pack.uDQEf5/_old 2014-02-18 16:17:51.000000000 +0100
+++ /var/tmp/diff_new_pack.uDQEf5/_new 2014-02-18 16:17:51.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package libqt5-qtmultimedia
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,29 +16,46 @@
#
+%define qt5_snapshot 0
+
%define libname libQt5Multimedia5
Name: libqt5-qtmultimedia
-Version: 5.2.0
+Version: 5.2.1
Release: 0
Summary: Qt 5 Multimedia Library
License: SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0
Group: Development/Libraries/X11
Url: http://qt.digia.com
+%define base_name libqt5
+%define real_version 5.2.1
+%define so_version 5.2.1
+%if %qt5_snapshot
+%define tar_version qtmultimedia-%{real_version}
+%else
+%define tar_version qtmultimedia-opensource-src-%{real_version}
+%endif
Source: %{tar_version}.tar.xz
BuildRequires: alsa-devel
BuildRequires: fdupes
BuildRequires: gstreamer-0_10-plugins-bad-devel
BuildRequires: gstreamer-0_10-plugins-base-devel
-%define base_name libqt5
-%define real_version 5.2.0
-%define so_version 5.2.0
-%define tar_version qtmultimedia-opensource-src-%{real_version}
-BuildRequires: libqt5-qtdeclarative-devel >= %{version}
+BuildRequires: libQt5Gui-private-headers-devel >= %{version}
+BuildRequires: libQt5Widgets-private-headers-devel >= %{version}
BuildRequires: libpulse-devel
-BuildRequires: libqt5-qtbase-private-headers-devel >= %{version}
BuildRequires: libwmf-devel
BuildRequires: openal-soft-devel
+BuildRequires: pkgconfig(Qt5Core) >= %{version}
+BuildRequires: pkgconfig(Qt5Gui) >= %{version}
+BuildRequires: pkgconfig(Qt5Network) >= %{version}
+BuildRequires: pkgconfig(Qt5OpenGL) >= %{version}
+BuildRequires: pkgconfig(Qt5Qml) >= %{version}
+BuildRequires: pkgconfig(Qt5Quick) >= %{version}
+BuildRequires: pkgconfig(Qt5Widgets) >= %{version}
+%if %qt5_snapshot
+#to create the forwarding headers
+BuildRequires: perl
+%endif
BuildRequires: xz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -50,7 +67,11 @@
handling.
%prep
+%if %qt5_snapshot
+%setup -q -n qtmultimedia-%{real_version}
+%else
%setup -q -n qtmultimedia-opensource-src-%{real_version}
+%endif
%package -n %libname
Summary: Qt 5 Multimedia Library
@@ -66,17 +87,12 @@
Summary: Qt Development Kit
Group: Development/Libraries/X11
Requires: %libname = %{version}
-Requires: alsa-devel
-Requires: gstreamer-0_10-plugins-bad-devel
-Requires: gstreamer-0_10-plugins-base-devel
-Requires: libqt5-qtdeclarative-devel >= %{version}
Requires: libpulse-devel
-Requires: libqt5-qtbase-devel >= %{version}
+Requires: libqt5-qtdeclarative-devel >= %{version}
Requires: libwmf-devel
Requires: openal-soft-devel
Provides: libQt5Multimedia-devel = %{version}
-# TODO: change to < on 5.2.1 update
-Obsoletes: libQt5Multimedia-devel <= %{version}
+Obsoletes: libQt5Multimedia-devel < %{version}
%description devel
You need this package, if you want to compile programs with qtmultimedia.
@@ -85,11 +101,10 @@
Summary: Non-ABI stable experimental API
Group: Development/Libraries/C and C++
Requires: %{name}-devel = %{version}
-Requires: libqt5-qtbase-private-headers-devel >= %{version}
-Requires: libqt5-qtdeclarative-private-headers-devel >= %{version}
+Requires: libQt5Gui-private-headers-devel >= %{version}
+Requires: libQt5Widgets-private-headers-devel >= %{version}
Provides: libQt5Multimedia-private-headers-devel = %{version}
-# TODO: change to < on 5.2.1 update
-Obsoletes: libQt5Multimedia-private-headers-devel <= %{version}
+Obsoletes: libQt5Multimedia-private-headers-devel < %{version}
%description private-headers-devel
This package provides private headers of libqt5-qtmultimedia that are normally
@@ -102,6 +117,10 @@
%postun -n %libname -p /sbin/ldconfig
%build
+%if %qt5_snapshot
+#force the configure script to generate the forwarding headers (it checks
whether .git directory exists)
+mkdir .git
+%endif
%qmake5
%make_jobs
@@ -109,14 +128,14 @@
%qmake5_install
find %{buildroot}/%{_libdir} -type f -name '*la' -print -exec perl -pi -e 's,
-L%{_builddir}/\S+,,g' {} \;
find %{buildroot}/%{_libdir} -type f -name '*pc' -print -exec perl -pi -e "s,
-L$RPM_BUILD_DIR/?\S+,,g" {} \; -exec sed -i -e
"s,^moc_location=.*,moc_location=%{_lib}qt5_bindir/moc," -e
"s,uic_location=.*,uic_location=%{_lib}qt5_bindir/uic," {} \;
+# kill .la files
+rm -f %{buildroot}%{_libqt5_libdir}/lib*.la
-%fdupes %{buildroot}/%{_libqt5_includedir}
-
-%clean
-rm -rf %{buildroot}
+%fdupes -s %{buildroot}/%{_libqt5_includedir}
%files -n %libname
%defattr(-,root,root,755)
+%doc LGPL_EXCEPTION.txt LICENSE.FDL LICENSE.GPL LICENSE.LGPL
%{_libqt5_libdir}/libQt5*.so.*
%{_libqt5_plugindir}/mediaservice
%{_libqt5_plugindir}/playlistformats
@@ -126,14 +145,15 @@
%files private-headers-devel
%defattr(-,root,root,755)
+%doc LGPL_EXCEPTION.txt LICENSE.FDL LICENSE.GPL LICENSE.LGPL
%{_libqt5_includedir}/Qt*/%{so_version}
%files devel
%defattr(-,root,root,755)
+%doc LGPL_EXCEPTION.txt LICENSE.FDL LICENSE.GPL LICENSE.LGPL
%exclude %{_libqt5_includedir}/Qt*/%{so_version}
%{_libqt5_includedir}/Qt*
%{_libqt5_libdir}/cmake/Qt5*
-%{_libqt5_libdir}/libQt5*.la
%{_libqt5_libdir}/libQt5*.prl
%{_libqt5_libdir}/libQt5*.so
%{_libqt5_libdir}/pkgconfig/Qt5*.pc
++++++ qtmultimedia-opensource-src-5.2.0.tar.xz ->
qtmultimedia-opensource-src-5.2.1.tar.xz ++++++
++++ 6028 lines of diff (skipped)
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
