Hello community, here is the log from the commit of package libqt5-qtbase for openSUSE:Factory checked in at 2013-10-17 14:21:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-qtbase (Old) and /work/SRC/openSUSE:Factory/.libqt5-qtbase.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtbase" Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-qtbase/libqt5-qtbase.changes 2013-10-06 14:27:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libqt5-qtbase.new/libqt5-qtbase.changes 2013-10-17 17:41:08.000000000 +0200 @@ -1,0 +2,11 @@ +Wed Oct 16 17:24:48 UTC 2013 - hrvoje.sen...@gmail.com + +- Further split libqt5-qtbase package to libQt5Concurrent5, + libQt5Core5, libQt5DBus5, libQt5Network5, libQt5Xml5, + libQt5PrintSupport5 and libQt5OpenGL5 +- Rename sql plugin subpackages for more consistent naming with the + rest of libraries +- Apply the same solution as with Qt4 with regards to rebuilds: + don't use current build date, but rather last changes date + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-qtbase.spec ++++++ --- /var/tmp/diff_new_pack.uhbBmA/_old 2013-10-17 17:41:17.000000000 +0200 +++ /var/tmp/diff_new_pack.uhbBmA/_new 2013-10-17 17:41:17.000000000 +0200 @@ -46,6 +46,8 @@ BuildRequires: xcb-util-wm-devel BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gtk+-2.0) +BuildRequires: pkgconfig(ice) +BuildRequires: pkgconfig(sm) BuildRequires: pkgconfig(xkbcommon) >= 0.2.0 Version: 5.1.1 Release: 0 @@ -55,8 +57,11 @@ Url: http://qt.digia.com %define base_name libqt5 %define real_version 5.1.1 +%define so_version 5.1.1 %define tar_version qtbase-opensource-src-%{real_version} Source: %{tar_version}.tar.xz +# to get mtime of file: +Source1: libqt5-qtbase.changes Source2: macros.qt5 Source3: baselibs.conf # PATCH-FIX-UPSTREAM qt-never-strip.diff -- for creating debug packages @@ -108,19 +113,28 @@ %package devel Summary: Qt Development Kit Group: Development/Libraries/X11 -Requires: %{name} = %{version} Requires: alsa-devel Requires: at-spi2-core-devel Requires: c++_compiler Requires: cups-devel Requires: freetype2-devel -Requires: libQt5Gui5 = %{version} -Requires: libQt5Test5 = %{version} -Requires: libQt5Widgets5 = %{version} +Requires: libQt5Concurrent5 >= %{version} +Requires: libQt5Core5 >= %{version} +Requires: libQt5DBus5 >= %{version} +Requires: libQt5Gui5 >= %{version} +Requires: libQt5Network5 >= %{version} +Requires: libQt5OpenGL5 >= %{version} +Requires: libQt5PrintSupport5 >= %{version} +Requires: libQt5Sql5-mysql >= %{version} +Requires: libQt5Sql5-postgresql >= %{version} +Requires: libQt5Sql5-sqlite >= %{version} +Requires: libQt5Sql5-unixODBC >= %{version} +Requires: libQt5Test5 >= %{version} +Requires: libQt5Widgets5 >= %{version} +Requires: libQt5Xml5 >= %{version} Requires: libjpeg-devel Requires: libmng-devel Requires: libpng-devel -Requires: libqt5-sql-sqlite >= %{version} Requires: libtiff-devel Requires: make Requires: openssl-devel @@ -144,6 +158,8 @@ Requires: xorg-x11-devel Requires: zlib-devel Requires: pkgconfig(glib-2.0) +Requires: pkgconfig(ice) +Requires: pkgconfig(sm) Requires: pkgconfig(xkbcommon) >= 0.2.0 %description devel @@ -152,56 +168,120 @@ include files and development applications like GUI designers, translator tools and code generators. +%package -n libQt5Core5 +Summary: Qt 5 Core Library +Group: Development/Libraries/X11 +Provides: libqt5-qtbase = %{version} +# FIXME change to < after Qt 5.2 update +Obsoletes: libqt5-qtbase <= %{version} + +%description -n libQt5Core5 +The Qt 5 Core library. + +%package -n libQt5DBus5 +Summary: Qt 5 DBus Library +Group: Development/Libraries/X11 + +%description -n libQt5DBus5 +The Qt 5 DBus library. + +%package -n libQt5Network5 +Summary: Qt 5 Network Library +Group: Development/Libraries/X11 + +%description -n libQt5Network5 +The Qt 5 Network library. + +%package -n libQt5OpenGL5 +Summary: Qt 5 OpenGL Library +Group: Development/Libraries/X11 + +%description -n libQt5OpenGL5 +The Qt 5 OpenGL library. + +%package -n libQt5PrintSupport5 +Summary: Qt 5 Print Support Library +Group: Development/Libraries/X11 + +%description -n libQt5PrintSupport5 +The Qt 5 Print Support library. + +%package -n libQt5Xml5 +Summary: Qt 5 Xml Library +Group: Development/Libraries/X11 + +%description -n libQt5Xml5 +The Qt 5 Xml library. + +%package -n libQt5Concurrent5 +Summary: Qt 5 Concurrent Library +Group: Development/Libraries/X11 + +%description -n libQt5Concurrent5 +The Qt 5 Concurrent library. + %package -n libQt5Test5 Summary: Qt 5 Test Library Group: Development/Libraries/X11 %description -n libQt5Test5 -Qt 5 library for testing. +The Qt 5 library for testing. %package -n libQt5Widgets5 Summary: Qt 5 Test Library Group: Development/Libraries/X11 %description -n libQt5Widgets5 -Qt 5 library to display widgets. +The Qt 5 library to display widgets. -%package -n libqt5-sql-sqlite +%package -n libQt5Sql5-sqlite Summary: Qt 5 sqlite plugin Group: Development/Libraries/C and C++ Requires: libQt5Sql5 = %{version} +Provides: libqt5-sql-sqlite = %{version} Provides: libqt5_sql_backend = %{version} +# FIXME change to < after Qt 5.2 update +Obsoletes: libqt5-sql-sqlite <= %{version} -%description -n libqt5-sql-sqlite +%description -n libQt5Sql5-sqlite Qt 5 sqlite plugin to be able to use database functionality with Qt applications without the need to setup a SQL server. -%package -n libqt5-sql-unixODBC +%package -n libQt5Sql5-unixODBC Summary: Qt 5 unixODBC plugin Group: Development/Libraries/C and C++ Requires: libQt5Sql5 = %{version} +Provides: libqt5-sql-unixODBC = %{version} Provides: libqt5_sql_backend = %{version} +# FIXME change to < after Qt 5.2 update +Obsoletes: libqt5-sql-unixODBC <= %{version} -%description -n libqt5-sql-unixODBC +%description -n libQt5Sql5-unixODBC Qt unixODBC plugin to support databases via unixODBC within Qt applications. -%package -n libqt5-sql-postgresql +%package -n libQt5Sql5-postgresql Summary: Qt 5 PostgreSQL plugin Group: Development/Libraries/C and C++ Requires: libQt5Sql5 = %{version} +Provides: libqt5-sql-postgresql = %{version} Provides: libqt5_sql_backend = %{version} +# FIXME change to < after Qt 5.2 update +Obsoletes: libqt5-sql-postgresql <= %{version} -%description -n libqt5-sql-postgresql +%description -n libQt5Sql5-postgresql Qt SQL plugin to support PostgreSQL servers in Qt applications. -%package -n libqt5-sql-mysql +%package -n libQt5Sql5-mysql Summary: Qt 5 MySQL support Group: Development/Libraries/C and C++ Requires: libQt5Sql5 = %{version} +Provides: libqt5-sql-mysql = %{version} Provides: libqt5_sql_backend = %{version} +# FIXME change to < after Qt 5.2 update +Obsoletes: libqt5-sql-mysql <= %{version} -%description -n libqt5-sql-mysql +%description -n libQt5Sql5-mysql A plugin to support MySQL server in Qt applications. %package -n libQt5Gui5 @@ -343,13 +423,21 @@ chmod -R 644 *.png popd -%fdupes %{buildroot}/%{libqt5_includedir} -%fdupes %{buildroot}/%{libqt5_archdatadir}/mkspecs +%fdupes -s %{buildroot} + +%post -n libQt5Core5 -p /sbin/ldconfig + +%post -n libQt5Concurrent5 -p /sbin/ldconfig + +%post -n libQt5DBus5 -p /sbin/ldconfig -%clean -rm -rf %{buildroot} +%post -n libQt5Network5 -p /sbin/ldconfig -%post -p /sbin/ldconfig +%post -n libQt5OpenGL5 -p /sbin/ldconfig + +%post -n libQt5PrintSupport5 -p /sbin/ldconfig + +%post -n libQt5Xml5 -p /sbin/ldconfig %post -n libQt5Gui5 -p /sbin/ldconfig @@ -359,7 +447,19 @@ %post -n libQt5Widgets5 -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%postun -n libQt5Core5 -p /sbin/ldconfig + +%postun -n libQt5Concurrent5 -p /sbin/ldconfig + +%postun -n libQt5DBus5 -p /sbin/ldconfig + +%postun -n libQt5Network5 -p /sbin/ldconfig + +%postun -n libQt5OpenGL5 -p /sbin/ldconfig + +%postun -n libQt5PrintSupport5 -p /sbin/ldconfig + +%postun -n libQt5Xml5 -p /sbin/ldconfig %postun -n libQt5Gui5 -p /sbin/ldconfig @@ -369,18 +469,45 @@ %postun -n libQt5Widgets5 -p /sbin/ldconfig -%files +%files -n libQt5Core5 %defattr(-,root,root,755) %doc *.txt LICENSE.LGPL LICENSE.FDL -%dir %{libqt5_libdir}/qt5 -%dir %{libqt5_plugindir} %{libqt5_libdir}/libQt5Core.so.* + +%files -n libQt5Concurrent5 +%defattr(-,root,root,755) +%doc *.txt LICENSE.LGPL LICENSE.FDL %{libqt5_libdir}/libQt5Concurrent.so.* + +%files -n libQt5DBus5 +%defattr(-,root,root,755) +%doc *.txt LICENSE.LGPL LICENSE.FDL %{libqt5_libdir}/libQt5DBus.so.* + +%files -n libQt5Network5 +%defattr(-,root,root,755) +%doc *.txt LICENSE.LGPL LICENSE.FDL %{libqt5_libdir}/libQt5Network.so.* -%{libqt5_libdir}/libQt5Xml.so.* +%dir %{libqt5_libdir}/qt5 +%dir %{libqt5_plugindir} %{libqt5_plugindir}/bearer +%files -n libQt5OpenGL5 +%defattr(-,root,root,755) +%doc *.txt LICENSE.LGPL LICENSE.FDL +%{libqt5_libdir}/libQt5OpenGL.so.* + +%files -n libQt5PrintSupport5 +%defattr(-,root,root,755) +%doc *.txt LICENSE.LGPL LICENSE.FDL +%{libqt5_libdir}/libQt5PrintSupport.so.* +%{libqt5_plugindir}/printsupport + +%files -n libQt5Xml5 +%defattr(-,root,root,755) +%doc *.txt LICENSE.LGPL LICENSE.FDL +%{libqt5_libdir}/libQt5Xml.so.* + %files -n libQt5Test5 %defattr(-,root,root,755) %doc *.txt LICENSE.LGPL LICENSE.FDL @@ -390,10 +517,7 @@ %defattr(-,root,root,755) %doc *.txt LICENSE.LGPL LICENSE.FDL %{libqt5_libdir}/libQt5Widgets.so.* -%{libqt5_libdir}/libQt5PrintSupport.so.* -%{libqt5_libdir}/libQt5OpenGL.so.* %{libqt5_plugindir}/accessible -%{libqt5_plugindir}/printsupport %files -n libQt5Gui5 %defattr(-,root,root,755) @@ -411,7 +535,7 @@ %{_bindir}/* %libqt5_bindir/* %dir %libqt5_bindir -%exclude %{libqt5_includedir}/*/5.1.1 +%exclude %{libqt5_includedir}/*/%{so_version} %{libqt5_includedir}/ %{libqt5_libdir}/cmake %{libqt5_libdir}/libQt5*.la @@ -426,7 +550,7 @@ %files private-headers-devel %defattr(-,root,root,755) %doc *.txt LICENSE.LGPL LICENSE.FDL -%{libqt5_includedir}/*/5.1.1 +%{libqt5_includedir}/*/%{so_version} %files -n libQt5Sql5 %defattr(-,root,root,755) @@ -434,22 +558,22 @@ %{libqt5_libdir}/libQt5Sql.so.* %dir %{libqt5_plugindir}/sqldrivers -%files -n libqt5-sql-sqlite +%files -n libQt5Sql5-sqlite %defattr(-,root,root,755) %doc *.txt LICENSE.LGPL LICENSE.FDL %{libqt5_plugindir}/sqldrivers/libqsqlite*.so -%files -n libqt5-sql-unixODBC +%files -n libQt5Sql5-unixODBC %defattr(-,root,root,755) %doc *.txt LICENSE.LGPL LICENSE.FDL %{libqt5_plugindir}/sqldrivers/libqsqlodbc*.so -%files -n libqt5-sql-postgresql +%files -n libQt5Sql5-postgresql %defattr(-,root,root,755) %doc *.txt LICENSE.LGPL LICENSE.FDL %{libqt5_plugindir}/sqldrivers/libqsqlpsql*.so -%files -n libqt5-sql-mysql +%files -n libQt5Sql5-mysql %defattr(-,root,root,755) %doc *.txt LICENSE.LGPL LICENSE.FDL %{libqt5_plugindir}/sqldrivers/libqsqlmysql*.so ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.uhbBmA/_old 2013-10-17 17:41:17.000000000 +0200 +++ /var/tmp/diff_new_pack.uhbBmA/_new 2013-10-17 17:41:17.000000000 +0200 @@ -1,10 +1,41 @@ -libqt5-qtbase -libQt5Test5 -libQtWidgets5 -libqt5-sql-sqlite -libqt5-sql-unixODBC -libqt5-sql-postgresql -libqt5-sql-mysql +libQt5Core5 + obsoletes "libqt5-qtbase-<targettype> <= <version>" + provides "libqt5-qtbase-<targettype> = <version>" +libQt5Concurrent5 +libQt5DBus5 +libQt5Network5 +libQt5OpenGL5 +libQt5PrintSupport5 +libQt5Xml5 libQt5Gui5 libQt5Sql5 +libQt5Test5 libQt5Widgets5 +libQt5Sql5-sqlite + obsoletes "libqt5-sql-sqlite-<targettype> <= <version>" + provides "libqt5-sql-sqlite-<targettype> = <version>" +libQt5Sql5-unixODBC + obsoletes "libqt5-sql-unixODBC-<targettype> <= <version>" + provides "libqt5-sql-unixODBC-<targettype> = <version>" +libQt5Sql5-postgresql + obsoletes "libqt5-sql-postgresql-<targettype> <= <version>" + provides "libqt5-sql-postgresql-<targettype> = <version>" +libQt5Sql5-mysql + obsoletes "libqt5-sql-mysql-<targettype> <= <version>" + provides "libqt5-sql-mysql-<targettype> = <version>" +libqt5-qtbase-devel + requires "libQt5Core5-<targettype> = <version>" + requires "libQt5Concurrent5-<targettype> = <version>" + requires "libQt5DBus5-<targettype> = <version>" + requires "libQt5Network5-<targettype> = <version>" + requires "libQt5OpenGL5-<targettype> = <version>" + requires "libQt5PrintSupport5-<targettype> = <version>" + requires "libQt5Xml5-<targettype> = <version>" + requires "libQt5Gui5-<targettype> = <version>" + requires "libQt5Sql5-<targettype> = <version>" + requires "libQt5Test5-<targettype> = <version>" + requires "libQt5Widgets5-<targettype> = <version>" + requires "libQt5Sql5-sqlite-<targettype> = <version>" + requires "libQt5Sql5-unixODBC-<targettype> = <version>" + requires "libQt5Sql5-postgresql-<targettype> = <version>" + requires "libQt5Sql5-mysql-<targettype> = <version>" \ No newline at end of file -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
