From 5fafdeef908d53cecd81a00afdb07fadcae93de51fceb9bb578c260732df0cf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 4 Oct 2013 11:54:25 +0000 Subject: [PATCH] Accepting request 202046 from KDE:Qt51 Update to 5.1.1, resubmitted due to factory-repo-checker bug OBS-URL: https://build.opensuse.org/request/show/202046 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qttools?expand=0&rev=2 --- libqt5-qttools.changes | 15 +++++ libqt5-qttools.spec | 96 ++++++++++++++--------------- qt5config.desktop | 10 --- qttools-opensource-src-5.1.0.tar.xz | 3 - qttools-opensource-src-5.1.1.tar.xz | 3 + 5 files changed, 64 insertions(+), 63 deletions(-) delete mode 100644 qt5config.desktop delete mode 100644 qttools-opensource-src-5.1.0.tar.xz create mode 100644 qttools-opensource-src-5.1.1.tar.xz diff --git a/libqt5-qttools.changes b/libqt5-qttools.changes index a82a55b..309be4d 100644 --- a/libqt5-qttools.changes +++ b/libqt5-qttools.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Wed Sep 11 19:25:27 UTC 2013 - hrvoje.senjan@gmail.com + +- Remove qt5config.desktop, as the binary for it doesn't exists + +------------------------------------------------------------------- +Thu Aug 29 21:03:11 UTC 2013 - hrvoje.senjan@gmail.com + +- Update to version 5.1.1: + * Bugfix release, please see + http://blog.qt.digia.com/blog/2013/08/28/qt-5-1-1-released/ + http://qt.gitorious.org/qt/qttools/blobs/release/dist/changes-5.1.1 + and http://qt-project.org/wiki/Qt511KnownIssues for known issues +- Small spec cleanup + ------------------------------------------------------------------- Sun Jul 7 07:23:51 UTC 2013 - stephan.binner@basyskom.com diff --git a/libqt5-qttools.spec b/libqt5-qttools.spec index c451dfc..cc7c9ae 100644 --- a/libqt5-qttools.spec +++ b/libqt5-qttools.spec @@ -17,30 +17,29 @@ Name: libqt5-qttools -BuildRequires: fdupes -Version: 5.1.0 +Version: 5.1.1 Release: 0 -%define base_name libqt5 -%define real_version 5.1.0 -%define so_version 5.1.0 -%define tar_version qttools-opensource-src-%{real_version} -BuildRequires: libQt5Quick-private-headers-devel -BuildRequires: libQt5WebKitWidgets-devel >= 5.1.0 -BuildRequires: libxslt-devel -BuildRequires: update-desktop-files -BuildRequires: xz -Url: http://qt.digia.com -Summary: Qt 5 QtTools Module License: SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0 +Summary: Qt 5 QtTools Module +Url: http://qt.digia.com Group: Development/Libraries/X11 Source: %{tar_version}.tar.xz -Source10: qt5config.desktop Source11: designer5.desktop Source12: linguist5.desktop Source13: assistant5.desktop Source14: assistant5.png Source15: designer5.png Source16: linguist5.png +BuildRequires: fdupes +%define base_name libqt5 +%define real_version 5.1.1 +%define so_version 5.1.1 +%define tar_version qttools-opensource-src-%{real_version} +BuildRequires: libQt5Quick-private-headers-devel >= %{version} +BuildRequires: libQt5WebKitWidgets-devel >= %{version} +BuildRequires: libxslt-devel +BuildRequires: update-desktop-files +BuildRequires: xz BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -49,18 +48,16 @@ Qt is a set of libraries for developing applications. This package contains base tools, like string, xml, and network handling. - - %prep %setup -q -n qttools-opensource-src-%{real_version} %package devel Summary: Qt Development Kit Group: Development/Libraries/X11 -Requires: %name = %version -Requires: libQt5Quick-devel +Requires: %{name} = %{version} +Requires: libQt5Quick-devel >= %{version} +Requires: libQt5WebKitWidgets-devel >= %{version} Requires: libxslt-devel -Requires: libQt5WebKitWidgets-devel >= 5.1.0 %description devel You need this package, if you want to compile programs with qttools. @@ -68,8 +65,8 @@ You need this package, if you want to compile programs with qttools. %package private-headers-devel Summary: Non-ABI stable experimental API Group: Development/Libraries/C and C++ -Requires: %name-devel = %version -Requires: libQt5Quick-private-headers-devel +Requires: %{name}-devel = %{version} +Requires: libQt5Quick-private-headers-devel >= %{version} %description private-headers-devel This package provides private headers of libqt5-qttools that are normally @@ -82,23 +79,23 @@ the exact Qt version. %postun -p /sbin/ldconfig %build -export PATH=%_libqt5_bindir:$PATH +export PATH=%{_libqt5_bindir}:$PATH %ifarch ppc64 - RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mminimal-toc" + RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %endif -export CXXFLAGS="$CXXFLAGS $RPM_OPT_FLAGS -DOPENSSL_LOAD_CONF" -export CFLAGS="$CFLAGS $RPM_OPT_FLAGS -DOPENSSL_LOAD_CONF" -export MAKEFLAGS="%{?jobs:-j %jobs}" +export CXXFLAGS="$CXXFLAGS %{optflags} -DOPENSSL_LOAD_CONF" +export CFLAGS="$CFLAGS %{optflags} -DOPENSSL_LOAD_CONF" +export MAKEFLAGS="%{?_smp_mflags}" qmake make %install -make INSTALL_ROOT=$RPM_BUILD_ROOT install -find $RPM_BUILD_ROOT/%_libdir -type f -name '*la' -print -exec perl -pi -e 's, -L%{_builddir}/\S+,,g' {} \; -find $RPM_BUILD_ROOT/%_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=%{_libqt5_bindir}/moc," -e "s,uic_location=.*,uic_location=%{_libqt5_bindir}/uic," {} \; -%fdupes $RPM_BUILD_ROOT/%{_libqt5_includedir} +make INSTALL_ROOT=%{buildroot} 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=%{_libqt5_bindir}/moc," -e "s,uic_location=.*,uic_location=%{_libqt5_bindir}/uic," {} \; +%fdupes %{buildroot}/%{_libqt5_includedir} -# put all the binaries to %_bindir, add -qt5 suffix, and symlink them back to %_qt5_bindir +# put all the binaries to %{_bindir}, add -qt5 suffix, and symlink them back to %_qt5_bindir mkdir %{buildroot}%{_bindir} pushd %{buildroot}%{_libqt5_bindir} for i in * ; do @@ -112,23 +109,22 @@ popd # install menu entries # -##%suse_update_desktop_file -i qt5config Qt Utility DesktopSettings ##%suse_update_desktop_file -i designer5 Qt Development GUIDesigner ##%suse_update_desktop_file -i linguist5 Qt Development Translation ##%suse_update_desktop_file -i assistant5 Qt Development Documentation -##mkdir -p $RPM_BUILD_ROOT/usr/share/doc/packages/libqt5 -##cp -a src/assistant/assistant/assistant.qch $RPM_BUILD_ROOT/usr/share/doc/packages/libqt5/ +##mkdir -p %{buildroot}%{_datadir}/doc/packages/libqt5 +##cp -a src/assistant/assistant/assistant.qch %{buildroot}%{_datadir}/doc/packages/libqt5/ %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files %defattr(-,root,root,755) -%_bindir/* +%{_bindir}/* %{_libqt5_bindir}/* -%_datadir/applications/*.desktop -%_datadir/pixmaps/*.png +%{_datadir}/applications/*.desktop +%{_datadir}/pixmaps/*.png %{_libqt5_libdir}/libQt5CLucene.so.* %{_libqt5_libdir}/libQt5Designer.so.* %{_libqt5_libdir}/libQt5DesignerComponents.so.* @@ -138,23 +134,23 @@ rm -rf $RPM_BUILD_ROOT %files private-headers-devel %defattr(-,root,root,755) -%{_libqt5_includedir}/QtCLucene/5.1.0 -%{_libqt5_includedir}/QtDesigner/5.1.0 -%{_libqt5_includedir}/QtDesignerComponents/5.1.0 -%{_libqt5_includedir}/QtHelp/5.1.0 -%{_libqt5_includedir}/QtUiTools/5.1.0 +%{_libqt5_includedir}/QtCLucene/%{so_version} +%{_libqt5_includedir}/QtDesigner/%{so_version} +%{_libqt5_includedir}/QtDesignerComponents/%{so_version} +%{_libqt5_includedir}/QtHelp/%{so_version} +%{_libqt5_includedir}/QtUiTools/%{so_version} %files devel %defattr(-,root,root,755) -%exclude %{_libqt5_includedir}/QtCLucene/5.1.0 +%exclude %{_libqt5_includedir}/QtCLucene/%{so_version} %{_libqt5_includedir}/QtCLucene -%exclude %{_libqt5_includedir}/QtDesigner/5.1.0 +%exclude %{_libqt5_includedir}/QtDesigner/%{so_version} %{_libqt5_includedir}/QtDesigner -%exclude %{_libqt5_includedir}/QtDesignerComponents/5.1.0 +%exclude %{_libqt5_includedir}/QtDesignerComponents/%{so_version} %{_libqt5_includedir}/QtDesignerComponents -%exclude %{_libqt5_includedir}/QtHelp/5.1.0 +%exclude %{_libqt5_includedir}/QtHelp/%{so_version} %{_libqt5_includedir}/QtHelp -%exclude %{_libqt5_includedir}/QtUiTools/5.1.0 +%exclude %{_libqt5_includedir}/QtUiTools/%{so_version} %{_libqt5_includedir}/QtUiTools %{_libqt5_libdir}/cmake/Qt5* %{_libqt5_libdir}/libQt5*.la @@ -163,7 +159,7 @@ rm -rf $RPM_BUILD_ROOT %{_libqt5_libdir}/libQt5*.a %{_libqt5_libdir}/pkgconfig/Qt5*.pc %{_libqt5_archdatadir}/mkspecs/modules/qt_lib_*.pri -%dir %_datadir/qt5 -%_datadir/qt5/phrasebooks +%dir %{_datadir}/qt5 +%{_datadir}/qt5/phrasebooks %changelog diff --git a/qt5config.desktop b/qt5config.desktop deleted file mode 100644 index d2d48e9..0000000 --- a/qt5config.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Categories=Qt;Settings -Encoding=UTF-8 -Exec=/usr/bin/qtconfig-qt5 -Name=Qt 5 Settings -X-KDE-StartupNotify=true -Icon=designer5 -Terminal=false -Type=Application - diff --git a/qttools-opensource-src-5.1.0.tar.xz b/qttools-opensource-src-5.1.0.tar.xz deleted file mode 100644 index e45e562..0000000 --- a/qttools-opensource-src-5.1.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e2841839b960c3fdf8bbc9dc7bbf3792b3fc3e86cd726be864d9152fb006e9a0 -size 8894340 diff --git a/qttools-opensource-src-5.1.1.tar.xz b/qttools-opensource-src-5.1.1.tar.xz new file mode 100644 index 0000000..0dc2201 --- /dev/null +++ b/qttools-opensource-src-5.1.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2b42c6d5feeccffb67e890b86a150bae64dd2ff550be39a3cc449ee0e95462b6 +size 8908232