rpms/qt-creator/F-11 .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 qt-creator.spec, 1.1, 1.2 sources, 1.2, 1.3 disable_private_header_check.patch, 1.1, NONE enable-signal-slot.patch, 1.1, NONE pluginPaths.patch, 1.1, NONE qtcreator-qworkbenchlibrary_lib64.patch, 1.1, NONE qtcreator-qworkbenchplugin_lib64.patch, 1.1, NONE qtcreator_rpath.patch, 1.1, NONE qworkbench_lib64.patch, 1.1, NONE

[Itamar Reis Peixoto]

Author: itamarjp

Update of /cvs/pkgs/rpms/qt-creator/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6851/F-11

Modified Files:
	.cvsignore import.log qt-creator.spec sources 
Removed Files:
	disable_private_header_check.patch enable-signal-slot.patch 
	pluginPaths.patch qtcreator-qworkbenchlibrary_lib64.patch 
	qtcreator-qworkbenchplugin_lib64.patch qtcreator_rpath.patch 
	qworkbench_lib64.patch 
Log Message:
qt-creator 1.1.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qt-creator/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	5 Apr 2009 03:06:11 -0000	1.2
+++ .cvsignore	26 Apr 2009 00:17:43 -0000	1.3
@@ -1 +1 @@
-qt-creator-1.0.0-src.zip
+qt-creator-1.1.0-src.zip


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/qt-creator/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	5 Apr 2009 03:06:11 -0000	1.1
+++ import.log	26 Apr 2009 00:17:43 -0000	1.2
@@ -1 +1,2 @@
 qt-creator-1_0_0-4_fc11:HEAD:qt-creator-1.0.0-4.fc11.src.rpm:1238900717
+qt-creator-1_1_0-2_fc11:F-11:qt-creator-1.1.0-2.fc11.src.rpm:1240704397


Index: qt-creator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt-creator/F-11/qt-creator.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qt-creator.spec	5 Apr 2009 03:06:11 -0000	1.1
+++ qt-creator.spec	26 Apr 2009 00:17:43 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           qt-creator
-Version:        1.0.0
-Release:        4%{?dist}
+Version:        1.1.0
+Release:        2%{?dist}
 Summary:        Lightweight and cross-platform IDE for Qt
 
 Group:          Development/Tools
@@ -11,29 +11,14 @@
 
 Source1:       qtcreator.desktop
 
-#make ui editor works
-#patch from http://labs.trolltech.com/gitweb?p=qt-creator;a=commitdiff;h=f3f20d96bdfb5266cc25ac91ae0def8a33875a81
-Patch0:         disable_private_header_check.patch
-
 #fix qdoc3 executable location in fedora
 Patch1:         qtdoc3_location.patch
 
-#make it install into lib64
-Patch2:         qtcreator-qworkbenchlibrary_lib64.patch
-Patch3:         qtcreator-qworkbenchplugin_lib64.patch
-Patch4:         qworkbench_lib64.patch
-Patch5:         qtcreator_rpath.patch
-
-#enable signal/slot editor  http://labs.trolltech.com/gitweb?p=qt-creator;a=commitdiff_plain;h=bf118eba1ee1f5b6e19c6f29cd7d114c121a20ef
-Patch6:        enable-signal-slot.patch
-
-#search for plugins in lib64 dir
-Patch7:        pluginPaths.patch
-
 #temporary disabled docs
 Patch8:       no-docu.diff
-
+Requires:       hicolor-icon-theme
 BuildRequires:  qt4-devel >= 4.5.0
+BuildRequires:  desktop-file-utils
 
 %description
 Qt Creator (previously known as Project Greenhouse) is a new,
@@ -43,20 +28,7 @@
 
 %prep
 %setup -q -n %name-%version-src
-%patch0 -p0
 %patch1 -p0
-
-#make it install into lib64
-%if "%{_lib}" == "lib64"
-%patch2 -p0
-%patch3 -p0
-%patch4 -p0
-%patch5 -p0
-%patch7 -p0
-%endif
-
-%patch6 -p0
-
 %patch8 -p0
 
 %build
@@ -73,17 +45,20 @@
 rm -rf $RPM_BUILD_ROOT
 make install INSTALL_ROOT=$RPM_BUILD_ROOT/%{_prefix}
 
+for i in 16 24 32 48 64 128
+do
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/${i}x${i}/apps
+# link it to %{_datadir}/pixmaps/qtcreator_logo_${i}.png
+ln -s ../../../../pixmaps/qtcreator_logo_${i}.png \
+ $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/${i}x${i}/apps/Nokia-QtCreator.png
+
+done
+
 desktop-file-install                                    \
 --add-category="Development"                            \
 --dir=%{buildroot}%{_datadir}/applications              \
 %{SOURCE1}
 
-
-
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -92,12 +67,22 @@
 %defattr(-,root,root,-)
 %doc README LICENSE.LGPL LGPL_EXCEPTION.TXT
 %{_bindir}/qtcreator
+%{_bindir}/qtcreator.bin
+%{_bindir}/qtcreator_process_stub
 %{_libdir}/qtcreator
 %{_datadir}/qtcreator
 %{_datadir}/pixmaps/qtcreator_logo_*.png
 %{_datadir}/applications/qtcreator.desktop
+%{_datadir}/icons/hicolor/*/apps/Nokia-QtCreator.png
 
 %changelog
+* Sat Apr 25 2009 Muayyad Saleh Alsadi <alsadi at ojuba.org> - 1.1.0-2
+- fix icons
+
+* Thu Apr 23 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.1.0-1
+- qt-creator 1.1.0
+- include missing BuildRequires desktop-file-utils
+
 * Tue Mar 20 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.0.0-4
 - fix lib's loading in 64 bit machines
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qt-creator/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	5 Apr 2009 03:06:12 -0000	1.2
+++ sources	26 Apr 2009 00:17:43 -0000	1.3
@@ -1 +1 @@
-5478124035d80a90e66a3db67ab4477a  qt-creator-1.0.0-src.zip
+f0fd01f7c5a1f50c479bed13db2134bf  qt-creator-1.1.0-src.zip


--- disable_private_header_check.patch DELETED ---


--- enable-signal-slot.patch DELETED ---


--- pluginPaths.patch DELETED ---


--- qtcreator-qworkbenchlibrary_lib64.patch DELETED ---


--- qtcreator-qworkbenchplugin_lib64.patch DELETED ---


--- qtcreator_rpath.patch DELETED ---


--- qworkbench_lib64.patch DELETED ---