Hello community,

here is the log from the commit of package libqt5-qtx11extras for 
openSUSE:Factory checked in at 2014-02-11 10:35:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtx11extras (Old)
 and      /work/SRC/openSUSE:Factory/.libqt5-qtx11extras.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "libqt5-qtx11extras"

Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt5-qtx11extras/libqt5-qtx11extras.changes    
2013-12-19 12:47:23.000000000 +0100
+++ 
/work/SRC/openSUSE:Factory/.libqt5-qtx11extras.new/libqt5-qtx11extras.changes   
    2014-02-11 10:35:20.000000000 +0100
@@ -1,0 +2,13 @@
+Mon Feb 10 11:13:16 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:
----
  qtx11extras-opensource-src-5.2.0.tar.xz

New:
----
  qtx11extras-opensource-src-5.2.1.tar.xz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ libqt5-qtx11extras.spec ++++++
--- /var/tmp/diff_new_pack.kzKJFT/_old  2014-02-11 10:35:20.000000000 +0100
+++ /var/tmp/diff_new_pack.kzKJFT/_new  2014-02-11 10:35:20.000000000 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package libqt5-qtx11extras
 #
-# 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,23 +16,34 @@
 #
 
 
+%define qt5_snapshot 0
+
 %define libname libQt5X11Extras5
 
 Name:           libqt5-qtx11extras
-BuildRequires:  fdupes
-Version:        5.2.0
+Version:        5.2.1
 Release:        0
 %define base_name libqt5
-%define real_version 5.2.0
-%define so_version 5.2.0
+%define real_version 5.2.1
+%define so_version 5.2.1
+%if %qt5_snapshot
+%define tar_version qtx11extras-%{real_version}
+%else
 %define tar_version qtx11extras-opensource-src-%{real_version}
-BuildRequires:  libqt5-qtbase-private-headers-devel >= %{version}
+%endif
+Source:         %{tar_version}.tar.xz
+BuildRequires:  fdupes
+BuildRequires:  libQt5Gui-private-headers-devel
+BuildRequires:  pkgconfig(Qt5Widgets) >= %{version}
+%if %qt5_snapshot
+#to create the forwarding headers
+BuildRequires:  perl
+%endif
 BuildRequires:  xz
 Url:            http://qt.digia.com
 Summary:        Qt 5 X11 Extras Addon
 License:        SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0
 Group:          Development/Libraries/X11
-Source:         %{tar_version}.tar.xz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -41,10 +52,12 @@
 This package contains base tools, like string, xml, and network
 handling.
 
-
-
 %prep
+%if %qt5_snapshot
+%setup -q -n qtx11extras-%{real_version}
+%else
 %setup -q -n qtx11extras-opensource-src-%{real_version}
+%endif
 
 %package -n %libname
 Summary:        Qt 5 X11 Extras Addon
@@ -60,10 +73,8 @@
 Summary:        Qt Development Kit
 Group:          Development/Libraries/X11
 Requires:       %libname = %version
-Requires:       libqt5-qtbase-private-headers-devel >= %{version}
 Provides:       libQt5X11Extras-devel = %{version}
-# TODO: change to < on 5.2.1 update
-Obsoletes:      libQt5X11Extras-devel <= %{version}
+Obsoletes:      libQt5X11Extras-devel < %{version}
 
 %description devel
 You need this package, if you want to compile programs with qtx11extras.
@@ -73,21 +84,28 @@
 %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
 
 %install
 %qmake5_install
+# kill .la files
+rm -f %{buildroot}%{_libqt5_libdir}/lib*.la
 
 %files -n %libname
 %defattr(-,root,root,755)
+%doc LGPL_EXCEPTION.txt LICENSE.FDL LICENSE.GPL LICENSE.LGPL
 %{_libqt5_libdir}/libQt5X11Extras.so.*
 
 %files devel
 %defattr(-,root,root,755)
+%doc LGPL_EXCEPTION.txt LICENSE.FDL LICENSE.GPL LICENSE.LGPL
 %{_libqt5_includedir}/QtX11Extras
 %{_libqt5_libdir}/cmake/Qt5X11Extras
-%{_libqt5_libdir}/libQt5X11Extras.la
 %{_libqt5_libdir}/libQt5X11Extras.prl
 %{_libqt5_libdir}/libQt5X11Extras.so
 %{_libqt5_libdir}/pkgconfig/Qt5X11Extras.pc

++++++ qtx11extras-opensource-src-5.2.0.tar.xz -> 
qtx11extras-opensource-src-5.2.1.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/qtx11extras-opensource-src-5.2.0/.qmake.conf 
new/qtx11extras-opensource-src-5.2.1/.qmake.conf
--- old/qtx11extras-opensource-src-5.2.0/.qmake.conf    2013-12-08 
18:10:16.000000000 +0100
+++ new/qtx11extras-opensource-src-5.2.1/.qmake.conf    2014-02-01 
21:37:59.000000000 +0100
@@ -1,3 +1,3 @@
 load(qt_build_config)
 
-MODULE_VERSION = 5.2.0
+MODULE_VERSION = 5.2.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/qtx11extras-opensource-src-5.2.0/.tag 
new/qtx11extras-opensource-src-5.2.1/.tag
--- old/qtx11extras-opensource-src-5.2.0/.tag   2013-12-08 18:10:16.000000000 
+0100
+++ new/qtx11extras-opensource-src-5.2.1/.tag   2014-02-01 21:37:59.000000000 
+0100
@@ -1 +1 @@
-120c2267e1960c03a22531c2d5bfe1d87d401ad9
+9131e081b91b5bbce791d3e328ae46fdb35c565d
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/qtx11extras-opensource-src-5.2.0/include/QtX11Extras/qtx11extrasversion.h 
new/qtx11extras-opensource-src-5.2.1/include/QtX11Extras/qtx11extrasversion.h
--- 
old/qtx11extras-opensource-src-5.2.0/include/QtX11Extras/qtx11extrasversion.h   
    2013-12-08 18:10:16.000000000 +0100
+++ 
new/qtx11extras-opensource-src-5.2.1/include/QtX11Extras/qtx11extrasversion.h   
    2014-02-01 21:37:59.000000000 +0100
@@ -2,8 +2,8 @@
 #ifndef QT_QTX11EXTRAS_VERSION_H
 #define QT_QTX11EXTRAS_VERSION_H
 
-#define QTX11EXTRAS_VERSION_STR "5.2.0"
+#define QTX11EXTRAS_VERSION_STR "5.2.1"
 
-#define QTX11EXTRAS_VERSION 0x050200
+#define QTX11EXTRAS_VERSION 0x050201
 
 #endif // QT_QTX11EXTRAS_VERSION_H

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to