Hello community, here is the log from the commit of package libqt5-creator for openSUSE:Factory checked in at 2014-04-05 16:47:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-creator (Old) and /work/SRC/openSUSE:Factory/.libqt5-creator.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-creator" Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-creator/libqt5-creator.changes 2014-03-27 09:29:41.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libqt5-creator.new/libqt5-creator.changes 2014-04-05 16:47:12.000000000 +0200 @@ -1,0 +2,16 @@ +Wed Apr 2 20:42:02 UTC 2014 - [email protected] + +- Update to 3.1.0 rc1 + * For more details see: + http://blog.qt.digia.com/blog/2014/04/03/qt-creator-3-1-rc1-released/ +- Only enable clang plugins on arches where clang is available +- Move the creator back to standard location +- Added conflict with Qt4 version +- Drop plugin_path.diff +- Build qbs plugin +- Added qbs-path.diff (imported from Qt4 version), so qbs plugin gets + installed to correct location +- Removed unused, and not needed sed workarounds from spec +- Improve logic for required libQt5Designer package + +------------------------------------------------------------------- Old: ---- plugin_path.diff qt-creator-opensource-src-3.1.0-beta.tar.gz New: ---- qbs-path.diff qt-creator-opensource-src-3.1.0-rc1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-creator.spec ++++++ --- /var/tmp/diff_new_pack.bzqBJN/_old 2014-04-05 16:47:14.000000000 +0200 +++ /var/tmp/diff_new_pack.bzqBJN/_new 2014-04-05 16:47:14.000000000 +0200 @@ -17,20 +17,20 @@ Name: libqt5-creator -Version: 3.1.0~beta +Version: 3.1.0~rc1 Release: 0 Summary: Lightweight IDE License: SUSE-LGPL-2.1-with-digia-exception-1.1 Group: Development/Tools/IDE Url: http://qt.digia.com/Product/Developer-Tools/ -%define rversion 3.1.0-beta +%define rversion 3.1.0-rc1 %define rname qt-creator %define qt5_version 5.3.0~beta Source: http://download.qt-project.org/development_releases/qtcreator/3.1/%{rversion}/%{rname}-opensource-src-%{rversion}.tar.gz Source1: %{name}-rpmlintrc Source2: qtcreator.desktop -# PATCH-FIX-UPSTREAM plugin_path.diff -- Don't hardcode plugin directory to root + lib dir, but use creator's install prefix -Patch0: plugin_path.diff +# PATCH-FIX-UPSTREAM qbs-path.diff -- install qbs plugin to sane location +Patch0: qbs-path.diff BuildRequires: fdupes BuildRequires: gdb BuildRequires: libbotan-devel @@ -40,13 +40,16 @@ BuildRequires: libqt5-qtscript-devel >= %{qt5_version} BuildRequires: libqt5-qttools-private-headers-devel >= %{qt5_version} BuildRequires: libqt5-qtx11extras-devel >= %{qt5_version} +%ifarch %arm %ix86 x86_64 BuildRequires: llvm-clang-devel +%endif BuildRequires: update-desktop-files BuildRequires: xz -Recommends: libqt5-debuginfo +Conflicts: qt-creator +Recommends: libqt5-qtbase-common-devel Recommends: libqt5-qtdoc # Make sure to rebuild against latest Qt5 (using the last package in chain - libQt5Designer5) -%requires_eq libQt5Designer5 +Requires: libQt5Designer5 = %( echo `rpm -q --queryformat '%{VERSION}' libqt5-qttools-devel`) BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -57,24 +60,14 @@ %prep %setup -q -n %{rname}-opensource-src-%{rversion} %patch0 -p1 -# we are not in '98, so don't put GUI binaries in /bin -sed -i 's|target.path = /bin|target.path = $$QTC_PREFIX/bin|g' src/tools/buildoutputparser/buildoutputparser.pro - -# Remove build time references so build-compare can do its work. Not yet activated - breaks build -#modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{_sourcedir}/%{name}.changes")" -#DATE="\"$(date -d "${modified}" "+%%b %%e %%Y")\"" -#TIME="\"$(date -d "${modified}" "+%%R")\"" -#find . -name '*.cpp' -print0 |\ -#xargs -0 sed -i "s/__DATE__/${DATE}/g;s/__TIME__/${TIME}/g" %build -export PATH=%_libqt5_bindir:$PATH -%if "%{_lib}"=="lib64" -%{_libqt5_bindir}/qmake QTC_PREFIX=%{_libqt5_archdatadir} LLVM_INSTALL_DIR=%{_prefix} IDE_LIBRARY_BASENAME=lib64 USE_SYSTEM_BOTAN=1 -%else -%{_libqt5_bindir}/qmake QTC_PREFIX=%{_libqt5_archdatadir} LLVM_INSTALL_DIR=%{_prefix} USE_SYSTEM_BOTAN=1 +%ifarch %arm %ix86 x86_64 +opts="LLVM_INSTALL_DIR=%{_prefix}" %endif -rm src/shared/qbs/qbs.pro +opts="$opts IDE_LIBRARY_BASENAME=%{_lib} USE_SYSTEM_BOTAN=1" + +%qmake5 $opts make %{?_smp_mflags} make qch_docs make html_docs_online @@ -82,8 +75,7 @@ %install export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}${LD_LIBRARY_PATH:+:}%{_libdir}" # its qmake. of course it is broken -# Install to %{_libqt5_archdatadir} for co-existance with Qt4 QtCretor -make INSTALL_ROOT=%{buildroot} install +make INSTALL_ROOT=%{buildroot}/%{_prefix} install mkdir -p %{buildroot}%{_datadir}/doc/packages/libqt5 cp share/doc/qtcreator/qtcreator.qch %{buildroot}%{_datadir}/doc/packages/libqt5/ @@ -91,25 +83,7 @@ mkdir -p %{buildroot}%{_datadir}/doc/packages/libqt5/qtcreator cp -a doc/html/* %{buildroot}%{_datadir}/doc/packages/libqt5/qtcreator/ -# We are using %_libqt5_bindir/qtcreator as qtcreator has somewhat strange mechanism for detecting datadir - it's relative to it's binary -# Until http://sourceforge.net/p/rpmlint/code/ci/f85186d/ is found in oS rpmlint package, we'll have false desktopfile-without-binary warning -%suse_update_desktop_file -c qtcreator-qt5 "Qt 5 Creator" "C++ IDE for developing Qt applications" %{_libqt5_bindir}/qtcreator QtProject-qtcreator-qt5 "Development Qt IDE" - -# Symlink icons from %%_libdir/qt5/share/icons/hicolor to standard location (due to desktop files check) -pushd %{buildroot}%{_libqt5_archdatadir} -for size in 48x48 24x24; do -for type in apps; do - mkdir -p %{buildroot}%{_datadir}/icons/hicolor/$size/$type - pushd %{buildroot}%{_datadir}/icons/hicolor/$size/$type - ln -s ../../../../../%{_lib}/qt5/share/icons/hicolor/$size/$type/QtProject-qtcreator.png QtProject-qtcreator-qt5.png -done -done - -# Create libqt5-creator.conf since it's not installed to standard location -mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d/ -cat <<EOF >%{buildroot}%{_sysconfdir}/ld.so.conf.d/libqt5-creator.conf -%{_libqt5_archdatadir}/%{_lib}/qtcreator -EOF +%suse_update_desktop_file -i qtcreator Development Qt IDE %fdupes -s %{buildroot} @@ -120,18 +94,11 @@ %files %defattr(-,root,root) %doc LICENSE.LGPL LGPL_EXCEPTION.TXT -%{_libqt5_bindir}/* -%dir %{_libqt5_archdatadir}/%{_lib} -%{_libqt5_archdatadir}/%{_lib}/qtcreator/ -%dir %{_libqt5_archdatadir}/share -%{_libqt5_archdatadir}/share/qtcreator/ +%{_bindir}/* +%{_libdir}/qtcreator/ +%{_datadir}/qtcreator/ %{_datadir}/icons/hicolor -%dir %{_libqt5_archdatadir}/share/icons -%{_libqt5_archdatadir}/share/icons/hicolor -%{_datadir}/applications/qtcreator-qt5.desktop -%dir %{_datadir}/doc/packages/libqt5 -%{_datadir}/doc/packages/libqt5/qtcreator.qch -%{_datadir}/doc/packages/libqt5/qtcreator -%config %{_sysconfdir}/ld.so.conf.d/libqt5-creator.conf +%{_datadir}/applications/qtcreator.desktop +%{_datadir}/doc/packages/libqt5/ %changelog ++++++ qbs-path.diff ++++++ --- a/src/shared/qbs/src/plugins/plugins.pri 2014-02-27 15:19:48.000000000 +0100 +++ b/src/shared/qbs/src/plugins/plugins.pri 2014-04-02 22:54:38.362554686 +0200 @@ -19,5 +19,5 @@ include(../library_dirname.pri) installPrefix = $${QBS_PLUGINS_INSTALL_DIR} else: \ installPrefix = $${QBS_INSTALL_PREFIX}/$${QBS_LIBRARY_DIRNAME} -target.path = $${installPrefix}/qbs/plugins +target.path = $$QTC_PREFIX/$${IDE_LIBRARY_BASENAME}/qtcreator/plugins/qbs/ INSTALLS += target -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
