Accepting request 201948 from KDE:Qt51

Update to 5.1.1, resubmitted due to factory-repo-checker bug

OBS-URL: https://build.opensuse.org/request/show/201948
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtdeclarative?expand=0&rev=2

libqt5-qtdeclarative.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Thu Aug 29 17:00:21 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/qtdeclarative/blobs/release/dist/changes-5.1.1
+  and http://qt-project.org/wiki/Qt511KnownIssues for known issues
+- Small spec cleanup
+
 -------------------------------------------------------------------
 Sat Aug  3 07:16:17 UTC 2013 - tittiatcoke@gmail.com
 

libqt5-qtdeclarative.spec

@@ -19,23 +19,23 @@
 %define libname libQtQuick5
 
 Name:           libqt5-qtdeclarative
-BuildRequires:  fdupes
+Version:        5.1.1
-Version:        5.1.0
 Release:        0
-%define base_name libqt5
-%define real_version 5.1.0
-%define so_version 5.1.0
-%define tar_version qtdeclarative-opensource-src-%{real_version}
-BuildRequires:  libQt5XmlPatterns-devel
-BuildRequires:  libQt5Svg-devel
-BuildRequires:  libqt5-qtbase-private-headers-devel
-BuildRequires:  libQt5V8-private-headers-devel
-BuildRequires:  xz
-Url:            http://qt.digia.com
-Summary:        Qt 5 Declarative Library
 License:        SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0
+Summary:        Qt 5 Declarative Library
+Url:            http://qt.digia.com
 Group:          Development/Libraries/X11
 Source:         %{tar_version}.tar.xz
+BuildRequires:  fdupes
+BuildRequires:  libQt5Svg-devel >= %{version}
+BuildRequires:  libQt5V8-private-headers-devel >= %{version}
+%define base_name libqt5
+%define real_version 5.1.1
+%define so_version 5.1.1
+%define tar_version qtdeclarative-opensource-src-%{real_version}
+BuildRequires:  libQt5XmlPatterns-devel >= %{version}
+BuildRequires:  libqt5-qtbase-private-headers-devel >= %{version}
+BuildRequires:  xz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -45,12 +45,10 @@ Qt is a set of libraries for developing applications.
 This package contains base tools, like string, xml, and network
 handling.
 
-
-
 %prep
 %setup -q -n qtdeclarative-opensource-src-%{real_version}
 
-%package -n %libname 
+%package -n %libname
 Summary:        Qt 5 Declarative Library
 Group:          Development/Libraries/X11
 
@@ -63,11 +61,11 @@ handling.
 %package -n libQt5Quick-devel
 Summary:        Qt Development Kit
 Group:          Development/Libraries/X11
-Requires:       %libname = %version
+Requires:       %libname = %{version}
-Requires:       libQt5XmlPatterns-devel
+Requires:       libQt5Svg-devel >= %{version}
-Requires:       libQt5V8-devel
+Requires:       libQt5V8-devel >= %{version}
-Requires:       libQt5Svg-devel
+Requires:       libQt5XmlPatterns-devel >= %{version}
-Requires:       libqt5-qtbase-devel
+Requires:       libqt5-qtbase-devel >= %{version}
 
 %description -n libQt5Quick-devel
 You need this package, if you want to compile programs with qtdeclarative.
@@ -75,9 +73,9 @@ You need this package, if you want to compile programs with qtdeclarative.
 %package -n libQt5Quick-private-headers-devel
 Summary:        Non-ABI stable experimental API
 Group:          Development/Libraries/C and C++
-Requires:       libQt5Quick-devel = %version
+Requires:       libQt5Quick-devel = %{version}
-Requires:       libqt5-qtbase-private-headers-devel
+Requires:       libQt5V8-private-headers-devel >= %{version}
-Requires:       libQt5V8-private-headers-devel
+Requires:       libqt5-qtbase-private-headers-devel >= %{version}
 
 %description -n libQt5Quick-private-headers-devel
 This package provides private headers of libqt5-qtdeclarative that are normally
@@ -94,22 +92,22 @@ the exact Qt version.
 %postun -n libQt5Quick-devel -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 CXXFLAGS="$CXXFLAGS %{optflags} -DOPENSSL_LOAD_CONF"
-export CFLAGS="$CFLAGS $RPM_OPT_FLAGS -DOPENSSL_LOAD_CONF"
+export CFLAGS="$CFLAGS %{optflags} -DOPENSSL_LOAD_CONF"
-export MAKEFLAGS="%{?jobs:-j %jobs}"
+export MAKEFLAGS="%{?_smp_mflags}"
 qmake
 make
 
 %install
-make INSTALL_ROOT=$RPM_BUILD_ROOT install
+make INSTALL_ROOT=%{buildroot} install
-find $RPM_BUILD_ROOT/%_libdir -type f -name '*la' -print -exec perl -pi -e 's, -L%{_builddir}/\S+,,g' {} \;
+find %{buildroot}/%{_libdir} -type f -name '*la' -print -exec perl -pi -e 's, -L%{_builddir}/\S+,,g' {} \;
-find $RPM_BUILD_ROOT/%_libdir/pkgconfig -type f -name '*pc' -print -exec perl -pi -e 's, -L%{_builddir}/\S+,,g' {} \;
+find %{buildroot}/%{_libdir}/pkgconfig -type f -name '*pc' -print -exec perl -pi -e 's, -L%{_builddir}/\S+,,g' {} \;
 
-# 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
@@ -119,10 +117,10 @@ for i in * ; do
 done
 popd
 
-%fdupes $RPM_BUILD_ROOT/%_libqt5_includedir
+%fdupes %{buildroot}/%{_lib}qt5_includedir
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files -n %libname
 %defattr(-,root,root,755)
@@ -135,19 +133,19 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libqt5_archdatadir}/qml/Qt/labs
 %dir %{_libqt5_archdatadir}/qml/QtQml
 %{_libqt5_archdatadir}/qml/Qt/labs/folderlistmodel
-%{_libqt5_plugindir}/accessible    
+%{_libqt5_plugindir}/accessible
 %{_libqt5_plugindir}/qmltooling
 
 %files -n libQt5Quick-private-headers-devel
 %defattr(-,root,root,755)
-%_libqt5_includedir/Qt*/%{so_version}
+%{_libqt5_includedir}/Qt*/%{so_version}
 
 %files -n libQt5Quick-devel
 %defattr(-,root,root,755)
 %{_bindir}/*
 %{_libqt5_bindir}/*
-%exclude %_libqt5_includedir/Qt*/%{so_version}
+%exclude %{_libqt5_includedir}/Qt*/%{so_version}
-%_libqt5_includedir/Qt*
+%{_libqt5_includedir}/Qt*
 %{_libqt5_libdir}/cmake/Qt5Q*
 %{_libqt5_libdir}/libQt5*.la
 %{_libqt5_libdir}/libQt5*.prl

qtdeclarative-opensource-src-5.1.0.tar.xz

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

qtdeclarative-opensource-src-5.1.1.tar.xz

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