From e8391a37d05d3724229332e4af92cc2f67b4fab1846a55e36d58eef57690c43f 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:53:15 +0000 Subject: [PATCH] Accepting request 202041 from KDE:Qt51 Update to 5.1.1, resubmitted due to factory-repo-checker bug OBS-URL: https://build.opensuse.org/request/show/202041 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtscript?expand=0&rev=2 --- libqt5-qtscript.changes | 10 ++++++ libqt5-qtscript.spec | 48 +++++++++++++--------------- qtscript-opensource-src-5.1.0.tar.xz | 3 -- qtscript-opensource-src-5.1.1.tar.xz | 3 ++ 4 files changed, 36 insertions(+), 28 deletions(-) delete mode 100644 qtscript-opensource-src-5.1.0.tar.xz create mode 100644 qtscript-opensource-src-5.1.1.tar.xz diff --git a/libqt5-qtscript.changes b/libqt5-qtscript.changes index 3b63214..bc502c3 100644 --- a/libqt5-qtscript.changes +++ b/libqt5-qtscript.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Aug 29 18:08:02 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/qtscript/blobs/release/dist/changes-5.1.1 + and http://qt-project.org/wiki/Qt511KnownIssues for known issues +- Small spec cleanup + ------------------------------------------------------------------- Sat Aug 3 07:23:12 UTC 2013 - tittiatcoke@gmail.com diff --git a/libqt5-qtscript.spec b/libqt5-qtscript.spec index 53e3a3c..85585f6 100644 --- a/libqt5-qtscript.spec +++ b/libqt5-qtscript.spec @@ -19,20 +19,20 @@ %define libname libQt5Script5 Name: libqt5-qtscript -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 qtscript-opensource-src-%{real_version} -BuildRequires: libqt5-qtbase-devel >= %version -BuildRequires: libqt5-qtbase-private-headers-devel -BuildRequires: xz -Url: http://qt.digia.com -Summary: Qt 5 QtScript Library License: SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0 +Summary: Qt 5 QtScript Library +Url: http://qt.digia.com Group: Development/Libraries/X11 Source: %{tar_version}.tar.xz +%define base_name libqt5 +%define real_version 5.1.1 +%define so_version 5.1.1 +%define tar_version qtscript-opensource-src-%{real_version} +BuildRequires: libqt5-qtbase-devel >= %{version} +BuildRequires: libqt5-qtbase-private-headers-devel >= %{version} +BuildRequires: xz BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -42,8 +42,6 @@ Qt is a set of libraries for developing applications. This package contains base tools, like string, xml, and network handling. - - %prep %setup -q -n qtscript-opensource-src-%{real_version} @@ -60,8 +58,8 @@ handling. %package -n libQt5Script-devel Summary: Qt Development Kit Group: Development/Libraries/X11 -Requires: %libname = %version -Requires: libqt5-qtbase-devel >= %version +Requires: %libname = %{version} +Requires: libqt5-qtbase-devel >= %{version} %description -n libQt5Script-devel You need this package, if you want to compile programs with qtscript. @@ -69,8 +67,8 @@ You need this package, if you want to compile programs with qtscript. %package -n libQt5Script-private-headers-devel Summary: Non-ABI stable experimental API Group: Development/Libraries/C and C++ -Requires: libQt5Script-devel = %version -Requires: libqt5-qtbase-private-headers-devel +Requires: libQt5Script-devel = %{version} +Requires: libqt5-qtbase-private-headers-devel >= %{version} %description -n libQt5Script-private-headers-devel This package provides private headers of libqt5-qtscript that are normally @@ -83,23 +81,23 @@ the exact Qt version. %postun -n %libname -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," {} \; +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," {} \; %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files -n %libname %defattr(-,root,root,755) diff --git a/qtscript-opensource-src-5.1.0.tar.xz b/qtscript-opensource-src-5.1.0.tar.xz deleted file mode 100644 index a27bf12..0000000 --- a/qtscript-opensource-src-5.1.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0cbe2e472657673ec8bd2f1ad133140b498292065159e67355f427e903c46d9b -size 2582388 diff --git a/qtscript-opensource-src-5.1.1.tar.xz b/qtscript-opensource-src-5.1.1.tar.xz new file mode 100644 index 0000000..7373403 --- /dev/null +++ b/qtscript-opensource-src-5.1.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d80061f7652ae3992e2b9ffbc7052d54872f6042a7a258b50d22eadf0175f364 +size 2584156