Accepting request 221708 from KDE:Qt5

update license files to %doc (forwarded request 221622 from mlin7442)

OBS-URL: https://build.opensuse.org/request/show/221708
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qttools?expand=0&rev=8

libqt5-qttools.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Mon Feb 10 11:17:47 UTC 2014 - mlin@suse.com
+
+- Update LICENSE files in %doc
+
+-------------------------------------------------------------------
+Wed Feb  5 17:07:24 UTC 2014 - hrvoje.senjan@gmail.com
+
+- 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
+
 -------------------------------------------------------------------
 Mon Dec 16 23:19:32 UTC 2013 - hrvoje.senjan@gmail.com
 

libqt5-qttools.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package libqt5-qttools
 #
-# 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,13 +16,23 @@
 #
 
 
+%define qt5_snapshot 0
+
 Name:           libqt5-qttools
-Version:        5.2.0
+Version:        5.2.1
 Release:        0
 Summary:        Qt 5 QtTools Module
 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 qttools-%{real_version}
+%else
+%define tar_version qttools-opensource-src-%{real_version}
+%endif
 Source:         %{tar_version}.tar.xz
 Source11:       designer5.desktop
 Source12:       linguist5.desktop
@@ -31,14 +41,16 @@ Source14:       assistant5.png
 Source15:       designer5.png
 Source16:       linguist5.png
 BuildRequires:  fdupes
-%define base_name libqt5
-%define real_version 5.2.0
-%define so_version 5.2.0
-%define tar_version qttools-opensource-src-%{real_version}
-BuildRequires:  libqt5-qtdeclarative-private-headers-devel >= %{version}
 BuildRequires:  libQt5WebKitWidgets-devel >= %{version}
+BuildRequires:  libqt5-qtbase-devel >= %{version}
+BuildRequires:  libqt5-qtbase-private-headers-devel >= %{version}
+BuildRequires:  libqt5-qtdeclarative-private-headers-devel >= %{version}
 BuildRequires:  libxslt-devel
 BuildRequires:  update-desktop-files
+%if %qt5_snapshot
+#to create the forwarding headers
+BuildRequires:  perl
+%endif
 BuildRequires:  xz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -49,7 +61,11 @@ Qt is a set of libraries for developing applications.
 This package contains base tools, like string, xml, and network handling.
 
 %prep
+%if %qt5_snapshot
+%setup -q -n qttools-%{real_version}
+%else
 %setup -q -n qttools-opensource-src-%{real_version}
+%endif
 
 %package devel
 Summary:        Qt Development Kit
@@ -59,8 +75,6 @@ Requires:       libQt5CLucene5 = %{version}
 Requires:       libQt5Designer5 = %{version}
 Requires:       libQt5DesignerComponents5 = %{version}
 Requires:       libQt5Help5 = %{version}
-Requires:       libqt5-qtdeclarative-devel >= %{version}
-Requires:       libQt5WebKitWidgets-devel >= %{version}
 Requires:       libxslt-devel
 
 %description devel
@@ -70,7 +84,6 @@ You need this package, if you want to compile programs with qttools.
 Summary:        Non-ABI stable experimental API
 Group:          Development/Libraries/C and C++
 Requires:       %{name}-devel = %{version}
-Requires:       libqt5-qtdeclarative-private-headers-devel >= %{version}
 
 %description private-headers-devel
 This package provides private headers of libqt5-qttools that are normally
@@ -127,6 +140,10 @@ The Qt 5 Help library.
 %postun -n libQt5Help5 -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
 
@@ -134,15 +151,26 @@ The Qt 5 Help library.
 %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=%{_libqt5_bindir}/moc," -e "s,uic_location=.*,uic_location=%{_libqt5_bindir}/uic," {} \;
-%fdupes %{buildroot}/%{_libqt5_includedir}
+%fdupes -s %{buildroot}/%{_libqt5_includedir}
 
-# put all the binaries to %{_bindir}, add -qt5 suffix, and symlink them back to %_qt5_bindir
+# kill .la files
-mkdir %{buildroot}%{_bindir}
+rm -f %{buildroot}%{_libqt5_libdir}/lib*.la
+
+# put all the binaries to %_bindir, add -qt5 suffix, and symlink them back to %_qt5_bindir
+mkdir -p %{buildroot}%{_bindir}
 pushd %{buildroot}%{_libqt5_bindir}
 for i in * ; do
+  case "${i}" in
+   assistant|designer|lconvert|linguist|lrelease|lupdate|pixeltool|qcollectiongenerator|qdbus|qdbusviewer|qhelpconverter|qhelpgenerator)
       mv $i ../../../bin/${i}-qt5
       ln -s ../../../bin/${i}-qt5 .
       ln -s ../../../bin/${i}-qt5 $i
+      ;;
+   *)
+      mv $i ../../../bin/
+      ln -s ../../../bin/$i .
+      ;;
+  esac
 done
 popd
 
@@ -159,7 +187,8 @@ popd
 
 %files
 %defattr(-,root,root,755)
-%{_bindir}/*
+%doc LGPL_EXCEPTION.txt LICENSE.FDL LICENSE.GPL LICENSE.LGPL
+%_bindir/*
 %{_libqt5_bindir}/*
 %{_datadir}/applications/*.desktop
 %{_datadir}/pixmaps/*.png
@@ -168,26 +197,27 @@ popd
 
 %files -n libQt5CLucene5
 %defattr(-,root,root,755)
-%doc *.txt LICENSE.LGPL LICENSE.FDL
+%doc LGPL_EXCEPTION.txt LICENSE.FDL LICENSE.GPL LICENSE.LGPL
 %{_libqt5_libdir}/libQt5CLucene.so.*
 
 %files -n libQt5Designer5
 %defattr(-,root,root,755)
-%doc *.txt LICENSE.LGPL LICENSE.FDL
+%doc LGPL_EXCEPTION.txt LICENSE.FDL LICENSE.GPL LICENSE.LGPL
 %{_libqt5_libdir}/libQt5Designer.so.*
 
 %files -n libQt5DesignerComponents5
 %defattr(-,root,root,755)
-%doc *.txt LICENSE.LGPL LICENSE.FDL
+%doc LGPL_EXCEPTION.txt LICENSE.FDL LICENSE.GPL LICENSE.LGPL
 %{_libqt5_libdir}/libQt5DesignerComponents.so.*
 
 %files -n libQt5Help5
 %defattr(-,root,root,755)
-%doc *.txt LICENSE.LGPL LICENSE.FDL
+%doc LGPL_EXCEPTION.txt LICENSE.FDL LICENSE.GPL LICENSE.LGPL
 %{_libqt5_libdir}/libQt5Help.so.*
 
 %files private-headers-devel
 %defattr(-,root,root,755)
+%doc LGPL_EXCEPTION.txt LICENSE.FDL LICENSE.GPL LICENSE.LGPL
 %{_libqt5_includedir}/QtCLucene/%{so_version}
 %{_libqt5_includedir}/QtDesigner/%{so_version}
 %{_libqt5_includedir}/QtDesignerComponents/%{so_version}
@@ -196,6 +226,7 @@ popd
 
 %files devel
 %defattr(-,root,root,755)
+%doc LGPL_EXCEPTION.txt LICENSE.FDL LICENSE.GPL LICENSE.LGPL
 %exclude %{_libqt5_includedir}/QtCLucene/%{so_version}
 %{_libqt5_includedir}/QtCLucene
 %exclude %{_libqt5_includedir}/QtDesigner/%{so_version}
@@ -207,7 +238,6 @@ popd
 %exclude %{_libqt5_includedir}/QtUiTools/%{so_version}
 %{_libqt5_includedir}/QtUiTools
 %{_libqt5_libdir}/cmake/Qt5*
-%{_libqt5_libdir}/libQt5*.la
 %{_libqt5_libdir}/libQt5*.prl
 %{_libqt5_libdir}/libQt5*.so
 %{_libqt5_libdir}/libQt5*.a

qttools-opensource-src-5.2.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ff331510ecb776b3059953e216e9fa7a4c0736eeb148c4cf11acc8150811b7f0
-size 8941736

qttools-opensource-src-5.2.1.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ff2f850f63798441aaaa0b18c741460acdd62c74d6a9e6a76521956e4bcb27d5
+size 8945736