1
0

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
This commit is contained in:
Tomáš Chvátal 2013-10-04 11:54:25 +00:00 committed by Git OBS Bridge
parent b825e9c1e0
commit 5fafdeef90
5 changed files with 64 additions and 63 deletions

View File

@ -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 Sun Jul 7 07:23:51 UTC 2013 - stephan.binner@basyskom.com

View File

@ -17,30 +17,29 @@
Name: libqt5-qttools Name: libqt5-qttools
BuildRequires: fdupes Version: 5.1.1
Version: 5.1.0
Release: 0 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 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 Group: Development/Libraries/X11
Source: %{tar_version}.tar.xz Source: %{tar_version}.tar.xz
Source10: qt5config.desktop
Source11: designer5.desktop Source11: designer5.desktop
Source12: linguist5.desktop Source12: linguist5.desktop
Source13: assistant5.desktop Source13: assistant5.desktop
Source14: assistant5.png Source14: assistant5.png
Source15: designer5.png Source15: designer5.png
Source16: linguist5.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 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. This package contains base tools, like string, xml, and network handling.
%prep %prep
%setup -q -n qttools-opensource-src-%{real_version} %setup -q -n qttools-opensource-src-%{real_version}
%package devel %package devel
Summary: Qt Development Kit Summary: Qt Development Kit
Group: Development/Libraries/X11 Group: Development/Libraries/X11
Requires: %name = %version Requires: %{name} = %{version}
Requires: libQt5Quick-devel Requires: libQt5Quick-devel >= %{version}
Requires: libQt5WebKitWidgets-devel >= %{version}
Requires: libxslt-devel Requires: libxslt-devel
Requires: libQt5WebKitWidgets-devel >= 5.1.0
%description devel %description devel
You need this package, if you want to compile programs with qttools. 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 %package private-headers-devel
Summary: Non-ABI stable experimental API Summary: Non-ABI stable experimental API
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: %name-devel = %version Requires: %{name}-devel = %{version}
Requires: libQt5Quick-private-headers-devel Requires: libQt5Quick-private-headers-devel >= %{version}
%description private-headers-devel %description private-headers-devel
This package provides private headers of libqt5-qttools that are normally This package provides private headers of libqt5-qttools that are normally
@ -82,23 +79,23 @@ the exact Qt version.
%postun -p /sbin/ldconfig %postun -p /sbin/ldconfig
%build %build
export PATH=%_libqt5_bindir:$PATH export PATH=%{_libqt5_bindir}:$PATH
%ifarch ppc64 %ifarch ppc64
RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mminimal-toc" RPM_OPT_FLAGS="%{optflags} -mminimal-toc"
%endif %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 qmake
make make
%install %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 -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," {} \; 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 $RPM_BUILD_ROOT/%{_libqt5_includedir} %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} mkdir %{buildroot}%{_bindir}
pushd %{buildroot}%{_libqt5_bindir} pushd %{buildroot}%{_libqt5_bindir}
for i in * ; do for i in * ; do
@ -112,23 +109,22 @@ popd
# install menu entries # 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 designer5 Qt Development GUIDesigner
##%suse_update_desktop_file -i linguist5 Qt Development Translation ##%suse_update_desktop_file -i linguist5 Qt Development Translation
##%suse_update_desktop_file -i assistant5 Qt Development Documentation ##%suse_update_desktop_file -i assistant5 Qt Development Documentation
##mkdir -p $RPM_BUILD_ROOT/usr/share/doc/packages/libqt5 ##mkdir -p %{buildroot}%{_datadir}/doc/packages/libqt5
##cp -a src/assistant/assistant/assistant.qch $RPM_BUILD_ROOT/usr/share/doc/packages/libqt5/ ##cp -a src/assistant/assistant/assistant.qch %{buildroot}%{_datadir}/doc/packages/libqt5/
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf %{buildroot}
%files %files
%defattr(-,root,root,755) %defattr(-,root,root,755)
%_bindir/* %{_bindir}/*
%{_libqt5_bindir}/* %{_libqt5_bindir}/*
%_datadir/applications/*.desktop %{_datadir}/applications/*.desktop
%_datadir/pixmaps/*.png %{_datadir}/pixmaps/*.png
%{_libqt5_libdir}/libQt5CLucene.so.* %{_libqt5_libdir}/libQt5CLucene.so.*
%{_libqt5_libdir}/libQt5Designer.so.* %{_libqt5_libdir}/libQt5Designer.so.*
%{_libqt5_libdir}/libQt5DesignerComponents.so.* %{_libqt5_libdir}/libQt5DesignerComponents.so.*
@ -138,23 +134,23 @@ rm -rf $RPM_BUILD_ROOT
%files private-headers-devel %files private-headers-devel
%defattr(-,root,root,755) %defattr(-,root,root,755)
%{_libqt5_includedir}/QtCLucene/5.1.0 %{_libqt5_includedir}/QtCLucene/%{so_version}
%{_libqt5_includedir}/QtDesigner/5.1.0 %{_libqt5_includedir}/QtDesigner/%{so_version}
%{_libqt5_includedir}/QtDesignerComponents/5.1.0 %{_libqt5_includedir}/QtDesignerComponents/%{so_version}
%{_libqt5_includedir}/QtHelp/5.1.0 %{_libqt5_includedir}/QtHelp/%{so_version}
%{_libqt5_includedir}/QtUiTools/5.1.0 %{_libqt5_includedir}/QtUiTools/%{so_version}
%files devel %files devel
%defattr(-,root,root,755) %defattr(-,root,root,755)
%exclude %{_libqt5_includedir}/QtCLucene/5.1.0 %exclude %{_libqt5_includedir}/QtCLucene/%{so_version}
%{_libqt5_includedir}/QtCLucene %{_libqt5_includedir}/QtCLucene
%exclude %{_libqt5_includedir}/QtDesigner/5.1.0 %exclude %{_libqt5_includedir}/QtDesigner/%{so_version}
%{_libqt5_includedir}/QtDesigner %{_libqt5_includedir}/QtDesigner
%exclude %{_libqt5_includedir}/QtDesignerComponents/5.1.0 %exclude %{_libqt5_includedir}/QtDesignerComponents/%{so_version}
%{_libqt5_includedir}/QtDesignerComponents %{_libqt5_includedir}/QtDesignerComponents
%exclude %{_libqt5_includedir}/QtHelp/5.1.0 %exclude %{_libqt5_includedir}/QtHelp/%{so_version}
%{_libqt5_includedir}/QtHelp %{_libqt5_includedir}/QtHelp
%exclude %{_libqt5_includedir}/QtUiTools/5.1.0 %exclude %{_libqt5_includedir}/QtUiTools/%{so_version}
%{_libqt5_includedir}/QtUiTools %{_libqt5_includedir}/QtUiTools
%{_libqt5_libdir}/cmake/Qt5* %{_libqt5_libdir}/cmake/Qt5*
%{_libqt5_libdir}/libQt5*.la %{_libqt5_libdir}/libQt5*.la
@ -163,7 +159,7 @@ rm -rf $RPM_BUILD_ROOT
%{_libqt5_libdir}/libQt5*.a %{_libqt5_libdir}/libQt5*.a
%{_libqt5_libdir}/pkgconfig/Qt5*.pc %{_libqt5_libdir}/pkgconfig/Qt5*.pc
%{_libqt5_archdatadir}/mkspecs/modules/qt_lib_*.pri %{_libqt5_archdatadir}/mkspecs/modules/qt_lib_*.pri
%dir %_datadir/qt5 %dir %{_datadir}/qt5
%_datadir/qt5/phrasebooks %{_datadir}/qt5/phrasebooks
%changelog %changelog

View File

@ -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

View File

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

View File

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