Hello community, here is the log from the commit of package libqt5-creator for openSUSE:Factory checked in at 2013-11-08 13:02:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2013-10-10 12:03:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libqt5-creator.new/libqt5-creator.changes 2013-11-08 13:02:15.000000000 +0100 @@ -1,0 +2,11 @@ +Thu Oct 24 01:30:29 UTC 2013 - [email protected] + +- Update to 3.0.0 beta + * New feature release, please see + http://blog.qt.digia.com/blog/2013/10/23/qt-creator-3-0-beta-released/ +- Package can now co-exist with qt-creator (based on Qt4) package +- Added plugin_path.diff to enable co-existance of the two packages. + Patch removes hardcoded plugin path, and adjusts qtcreator recognizing + plugin path as per install prefix + +------------------------------------------------------------------- Old: ---- qt-creator-2.8.1-src.tar.gz New: ---- plugin_path.diff qt-creator-3.0.0-beta-src.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-creator.spec ++++++ --- /var/tmp/diff_new_pack.2KdwXf/_old 2013-11-08 13:02:17.000000000 +0100 +++ /var/tmp/diff_new_pack.2KdwXf/_new 2013-11-08 13:02:17.000000000 +0100 @@ -17,16 +17,18 @@ Name: libqt5-creator -Version: 2.8.1 +Version: 3.0.0~beta 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 2.8.1 -Source: http://download.qt-project.org/official_releases/qtcreator/2.8/%{rversion}/qt-creator-%{rversion}-src.tar.gz +%define rversion 3.0.0 +Source: http://download.qt-project.org/development_releases/qtcreator/3.0/3.0.0-beta/qt-creator-3.0.0-beta-src.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 BuildRequires: fdupes BuildRequires: gdb BuildRequires: libQt5Declarative-private-headers-devel @@ -40,7 +42,6 @@ Recommends: libqt5-debuginfo Recommends: libqt5-qtdoc BuildRoot: %{_tmppath}/%{name}-%{version}-build -Conflicts: qt-creator %description Qt Creator is a new, lightweight, cross-platform integrated development @@ -48,13 +49,22 @@ framework even faster and easier. %prep -%setup -q -n qt-creator-%rversion-src +%setup -q -n qt-creator-3.0.0-beta-src +%patch0 -p1 + +# 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" -%{_bindir}/qmake-qt5 IDE_LIBRARY_BASENAME=lib64 +%{_libqt5_bindir}/qmake QTC_PREFIX=%{_libqt5_archdatadir} IDE_LIBRARY_BASENAME=lib64 %else -%{_bindir}/qmake-qt5 +%{_libqt5_bindir}/qmake QTC_PREFIX=%{_libqt5_archdatadir} %endif rm src/shared/qbs/qbs.pro make %{?_smp_mflags} @@ -64,7 +74,8 @@ %install export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}${LD_LIBRARY_PATH:+:}%{_libdir}" # its qmake. of course it is broken -make INSTALL_ROOT=%{buildroot}/%{_prefix} install +# Install to %{_libqt5_archdatadir} for co-existance with Qt4 QtCretor +make INSTALL_ROOT=%{buildroot} install mkdir -p %{buildroot}%{_datadir}/doc/packages/libqt5 cp share/doc/qtcreator/qtcreator.qch %{buildroot}%{_datadir}/doc/packages/libqt5/ @@ -72,7 +83,25 @@ mkdir -p %{buildroot}%{_datadir}/doc/packages/libqt5/qtcreator cp -a doc/html/* %{buildroot}%{_datadir}/doc/packages/libqt5/qtcreator/ -%suse_update_desktop_file -i qtcreator Development Qt IDE +# 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 %fdupes -s %{buildroot} @@ -83,13 +112,18 @@ %files %defattr(-,root,root) %doc LICENSE.LGPL LGPL_EXCEPTION.TXT -%{_bindir}/* -%{_libdir}/qtcreator/ -%{_datadir}/qtcreator/ +%{_libqt5_bindir}/* +%dir %{_libqt5_archdatadir}/%{_lib} +%{_libqt5_archdatadir}/%{_lib}/qtcreator/ +%dir %{_libqt5_archdatadir}/share +%{_libqt5_archdatadir}/share/qtcreator/ %{_datadir}/icons/hicolor -%{_datadir}/applications/qtcreator.desktop +%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 %changelog ++++++ plugin_path.diff ++++++ diff -Naur qt-creator-2.8.81~git.orig/qtcreator.pri qt-creator-2.8.81~git/qtcreator.pri --- qt-creator-2.8.81~git.orig/qtcreator.pri 2013-08-28 11:27:58.679332964 +0200 +++ qt-creator-2.8.81~git/qtcreator.pri 2013-08-28 21:45:35.850769575 +0200 @@ -141,6 +141,7 @@ } else { contains(TEMPLATE, vc.*):vcproj = 1 IDE_APP_TARGET = qtcreator + QTC_PREFIX = $$QTC_PREFIX IDE_LIBRARY_PATH = $$IDE_BUILD_TREE/$$IDE_LIBRARY_BASENAME/qtcreator IDE_PLUGIN_PATH = $$IDE_LIBRARY_PATH/plugins IDE_LIBEXEC_PATH = $$IDE_APP_PATH # FIXME @@ -161,9 +162,9 @@ LIBS += -L$$IDE_LIBRARY_PATH !isEmpty(vcproj) { - DEFINES += IDE_LIBRARY_BASENAME=\"$$IDE_LIBRARY_BASENAME\" + DEFINES += IDE_LIBRARY_BASENAME=\"$$IDE_LIBRARY_BASENAME\" QTC_PREFIX=\"$$QTC_PREFIX\" } else { - DEFINES += IDE_LIBRARY_BASENAME=\\\"$$IDE_LIBRARY_BASENAME\\\" + DEFINES += IDE_LIBRARY_BASENAME=\\\"$$IDE_LIBRARY_BASENAME\\\" QTC_PREFIX=\\\"$$QTC_PREFIX\\\" } DEFINES += QT_CREATOR QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII diff -Naur qt-creator-2.8.81~git.orig/src/app/main.cpp qt-creator-2.8.81~git/src/app/main.cpp --- qt-creator-2.8.81~git.orig/src/app/main.cpp 2013-08-28 11:27:58.990329076 +0200 +++ qt-creator-2.8.81~git/src/app/main.cpp 2013-08-28 22:41:30.376832228 +0200 @@ -195,7 +195,7 @@ const QString rootDirPath = rootDir.canonicalPath(); #if !defined(Q_OS_MAC) // 1) "plugins" (Win/Linux) - QString pluginPath = rootDirPath; + QString pluginPath = QLatin1String(QTC_PREFIX); pluginPath += QLatin1Char('/'); pluginPath += QLatin1String(IDE_LIBRARY_BASENAME); pluginPath += QLatin1String("/qtcreator/plugins"); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
