diff --git a/.cvsignore b/.cvsignore index 61f3f3d..a40d53c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -qt-creator-1.1.0-src.zip +qt-creator-1.2.0-src.zip diff --git a/import.log b/import.log index af8e81f..4095e04 100644 --- a/import.log +++ b/import.log @@ -1,3 +1,4 @@ qt-creator-1_0_0-4_fc11:HEAD:qt-creator-1.0.0-4.fc11.src.rpm:1238900717 qt-creator-1_1_0-1_fc11:HEAD:qt-creator-1.1.0-1.fc11.src.rpm:1240510779 qt-creator-1_1_0-2_fc11:HEAD:qt-creator-1.1.0-2.fc11.src.rpm:1240702375 +qt-creator-1_2_0-1_fc11:HEAD:qt-creator-1.2.0-1.fc11.src.rpm:1246231788 diff --git a/no-docu.diff b/no-docu.diff deleted file mode 100644 index 30ff92c..0000000 --- a/no-docu.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- qtcreator.pro -+++ qtcreator.pro -@@ -5,7 +5,6 @@ count(TOO_OLD_LIST, 1) { - error("Use at least Qt 4.5.") - } - --include(doc/doc.pri) - - TEMPLATE = subdirs - CONFIG += ordered diff --git a/qt-creator-1.2.0-lib64.patch b/qt-creator-1.2.0-lib64.patch new file mode 100644 index 0000000..1f9add7 --- /dev/null +++ b/qt-creator-1.2.0-lib64.patch @@ -0,0 +1,12 @@ +diff -ruNp a/qt-creator-1.2.0-src/qtcreator.pri b/qt-creator-1.2.0-src/qtcreator.pri +--- a/qt-creator-1.2.0-src/qtcreator.pri 2009-06-19 10:58:11.000000000 -0300 ++++ b/qt-creator-1.2.0-src/qtcreator.pri 2009-06-28 19:18:58.806588157 -0300 +@@ -36,7 +36,7 @@ isEmpty(TEST):CONFIG(debug, debug|releas + } + + isEmpty(IDE_LIBRARY_BASENAME) { +- IDE_LIBRARY_BASENAME = lib ++ IDE_LIBRARY_BASENAME = lib64 + } + + DEFINES += IDE_LIBRARY_BASENAME=\\\"$$IDE_LIBRARY_BASENAME\\\" diff --git a/qt-creator.spec b/qt-creator.spec index b32e1ce..e6672a2 100644 --- a/qt-creator.spec +++ b/qt-creator.spec @@ -1,6 +1,6 @@ Name: qt-creator -Version: 1.1.0 -Release: 2%{?dist} +Version: 1.2.0 +Release: 1%{?dist} Summary: Lightweight and cross-platform IDE for Qt Group: Development/Tools @@ -12,10 +12,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source1: qtcreator.desktop #fix qdoc3 executable location in fedora +Patch0: qt-creator-1.2.0-lib64.patch Patch1: qtdoc3_location.patch #temporary disabled docs -Patch8: no-docu.diff Requires: hicolor-icon-theme BuildRequires: qt4-devel >= 4.5.0 BuildRequires: desktop-file-utils @@ -29,7 +29,12 @@ even faster and easier. %prep %setup -q -n %name-%version-src %patch1 -p0 -%patch8 -p0 + +#make it install into lib64 +%if "%{_lib}" == "lib64" +%patch0 -p2 +%endif + %build QTDIR="%{_qt4_prefix}" ; export QTDIR ; \ @@ -66,7 +71,6 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc README LICENSE.LGPL LGPL_EXCEPTION.TXT -%{_bindir}/qtcreator %{_bindir}/qtcreator.bin %{_bindir}/qtcreator_process_stub %{_libdir}/qtcreator @@ -74,8 +78,12 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/pixmaps/qtcreator_logo_*.png %{_datadir}/applications/qtcreator.desktop %{_datadir}/icons/hicolor/*/apps/Nokia-QtCreator.png +%{_datadir}/doc/qtcreator/qtcreator.qch %changelog +* Sun Jun 28 2009 Itamar Reis Peixoto - 1.2.0-1 +- new version 1.2.0 + * Sat Apr 25 2009 Muayyad Saleh Alsadi - 1.1.0-2 - fix icons diff --git a/qtcreator.desktop b/qtcreator.desktop index 267bd1d..7cd862f 100644 --- a/qtcreator.desktop +++ b/qtcreator.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Application -Exec=qtcreator %F +Exec=qtcreator.bin %F Name=Qt Creator GenericName=C++ IDE for developing Qt applications X-KDE-StartupNotify=true diff --git a/sources b/sources index 9ba29bd..a886037 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f0fd01f7c5a1f50c479bed13db2134bf qt-creator-1.1.0-src.zip +87315f83e37dc92dfb5730282d5ecb56 qt-creator-1.2.0-src.zip