rpms/qt-creator/devel qt-creator-1.2.0-lib64.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 import.log, 1.3, 1.4 qt-creator.spec, 1.3, 1.4 qtcreator.desktop, 1.1, 1.2 sources, 1.3, 1.4 no-docu.diff, 1.1, NONE

[Itamar Reis Peixoto]

Author: itamarjp

Update of /cvs/pkgs/rpms/qt-creator/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19952/devel

Modified Files:
	.cvsignore import.log qt-creator.spec qtcreator.desktop 
	sources 
Added Files:
	qt-creator-1.2.0-lib64.patch 
Removed Files:
	no-docu.diff 
Log Message:
new version 1.2.0


qt-creator-1.2.0-lib64.patch:

--- NEW FILE qt-creator-1.2.0-lib64.patch ---
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\\\"


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qt-creator/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	23 Apr 2009 18:23:40 -0000	1.3
+++ .cvsignore	28 Jun 2009 23:33:09 -0000	1.4
@@ -1 +1 @@
-qt-creator-1.1.0-src.zip
+qt-creator-1.2.0-src.zip


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/qt-creator/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	25 Apr 2009 23:38:16 -0000	1.3
+++ import.log	28 Jun 2009 23:33:09 -0000	1.4
@@ -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


Index: qt-creator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt-creator/devel/qt-creator.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- qt-creator.spec	25 Apr 2009 23:38:16 -0000	1.3
+++ qt-creator.spec	28 Jun 2009 23:33:09 -0000	1.4
@@ -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}-%{ve
 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 <itamar at ispbrasil.com.br> - 1.2.0-1
+- new version 1.2.0
+
 * Sat Apr 25 2009 Muayyad Saleh Alsadi <alsadi at ojuba.org> - 1.1.0-2
 - fix icons
 


Index: qtcreator.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/qt-creator/devel/qtcreator.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- qtcreator.desktop	5 Apr 2009 03:06:11 -0000	1.1
+++ qtcreator.desktop	28 Jun 2009 23:33:10 -0000	1.2
@@ -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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qt-creator/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	23 Apr 2009 18:23:41 -0000	1.3
+++ sources	28 Jun 2009 23:33:10 -0000	1.4
@@ -1 +1 @@
-f0fd01f7c5a1f50c479bed13db2134bf  qt-creator-1.1.0-src.zip
+87315f83e37dc92dfb5730282d5ecb56  qt-creator-1.2.0-src.zip


--- no-docu.diff DELETED ---