rpms/qt-creator/F-12 qtcreator-bin-wrapper, NONE, 1.1 .cvsignore, 1.7, 1.8 import.log, 1.7, 1.8 qt-creator.spec, 1.10, 1.11 sources, 1.7, 1.8

[Itamar Reis Peixoto]

Author: itamarjp

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

Modified Files:
	.cvsignore import.log qt-creator.spec sources 
Added Files:
	qtcreator-bin-wrapper 
Log Message:
- new version 1.3.1



--- NEW FILE qtcreator-bin-wrapper ---
#!/bin/sh

bindir=$(dirname "$(readlink -nf $0)")
if test "$(uname -m)" = "x86_64" ; then
    libdir=$(cd "${bindir}/../lib64" ; pwd)
else
    libdir=$(cd "${bindir}/../lib" ; pwd)
fi
LD_LIBRARY_PATH="${libdir}/qtcreator:${LD_LIBRARY_PATH}" exec "${bindir}/qtcreator.bin" ${1+"$@"}


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qt-creator/F-12/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	12 Sep 2009 05:36:21 -0000	1.7
+++ .cvsignore	10 Feb 2010 14:14:34 -0000	1.8
@@ -1 +1 @@
-qt-creator-1.2.90-src.tar.gz
+qt-creator-1.3.1-src.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/qt-creator/F-12/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- import.log	12 Sep 2009 05:36:21 -0000	1.7
+++ import.log	10 Feb 2010 14:14:34 -0000	1.8
@@ -5,3 +5,4 @@ qt-creator-1_2_0-1_fc11:HEAD:qt-creator-
 qt-creator-1_2_0-2_fc11:HEAD:qt-creator-1.2.0-2.fc11.src.rpm:1247501081
 qt-creator-1_2_1-1_fc11:HEAD:qt-creator-1.2.1-1.fc11.src.rpm:1247581546
 qt-creator-1_2_90-1_fc12:HEAD:qt-creator-1.2.90-1.fc12.src.rpm:1252733747
+qt-creator-1_3_1-1_fc13:F-12:qt-creator-1.3.1-1.fc13.src.rpm:1265811234


Index: qt-creator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt-creator/F-12/qt-creator.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- qt-creator.spec	22 Nov 2009 13:03:32 -0000	1.10
+++ qt-creator.spec	10 Feb 2010 14:14:34 -0000	1.11
@@ -1,18 +1,24 @@
 Name:           qt-creator
-Version:        1.2.90
-Release:        2%{?dist}
+Version:        1.3.1
+Release:        1%{?dist}
 Summary:        Lightweight and cross-platform IDE for Qt
 
 Group:          Development/Tools
 License:        LGPLv2 with exceptions
 URL:            http://www.qtsoftware.com/developer/qt-creator
-Source0:        http://download.qtsoftware.com/qtcreator/%name-%version-src.tar.gz
+Source0:        http://get.qt.nokia.com/qtcreator/%{name}-%{version}-src.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source1:       qtcreator.desktop
+Source2:       qtcreator-bin-wrapper
 
 Requires:       hicolor-icon-theme
-BuildRequires:  qt4-devel >= 4.5.0
+
+#required for demos/examples
+Requires:       qt-demos
+Requires:       qt-examples
+
+BuildRequires:  qt4-devel >= 4.6.1
 BuildRequires:  desktop-file-utils
 
 %description
@@ -22,7 +28,7 @@ designed to make development with the Qt
 even faster and easier.
 
 %prep
-%setup -q -n %name-%version-src
+%setup -q -n %{name}-%{version}-src
 
 %build
 QTDIR="%{_qt4_prefix}" ; export QTDIR ; \
@@ -38,11 +44,6 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make install INSTALL_ROOT=$RPM_BUILD_ROOT/%{_prefix}
 
-# translations AVP
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/qtcreator/translations
-cp -p share/qtcreator/translations/*.qm $RPM_BUILD_ROOT/%{_datadir}/qtcreator/translations/
-
-
 for i in 16 24 32 48 64 128 256
 do
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/${i}x${i}/apps
@@ -57,6 +58,8 @@ desktop-file-install                    
 --dir=%{buildroot}%{_datadir}/applications              \
 %{SOURCE1}
 
+install -Dp -m 755 %{SOURCE2} $RPM_BUILD_ROOT/%{_bindir}/qtcreator
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -78,6 +81,7 @@ gtk-update-icon-cache %{_datadir}/icons/
 %files
 %defattr(-,root,root,-)
 %doc README LICENSE.LGPL LGPL_EXCEPTION.TXT
+%{_bindir}/qtcreator
 %{_bindir}/qtcreator.bin
 %{_bindir}/qtcreator_process_stub
 %{_libdir}/qtcreator
@@ -88,8 +92,27 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/doc/qtcreator/qtcreator.qch
 
 %changelog
-* Sun Nov 22 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.2.90-2
-- install translations
+* Mon Jan 25 2010 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.3.1-1
+- new version 1.3.1
+
+* Tue Dec  1 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 1.3.0-2
+- Force dependency on Qt >= 4.6.0
+
+* Tue Dec  1 2009 Lorenzo Villani <lvillani at binaryhelix.net> - 1.3.0-1
+- 1.3.0 final
+
+* Sun Nov 22 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.3.0-0.4.rc
+- include demos/examples.
+
+* Wed Nov 18 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.3.0-0.3.rc
+- fix install of /usr/bin/qtcreator wrapper
+
+* Tue Nov 17 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.3.0-0.2.rc
+- new version Qt Creator 1.3 Release Candidate(RC)
+- include /usr/bin/qtcreator wrapper to /usr/bin/qtcreator.bin
+
+* Wed Oct 14 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.3.0-0.1.beta
+- new version 1.3.0-beta
 
 * Sat Sep 12 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 1.2.90-1
 - new version 1.2.90 (Qt Creator Technology Snapshot 1.2.90)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qt-creator/F-12/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	12 Sep 2009 05:36:21 -0000	1.7
+++ sources	10 Feb 2010 14:14:34 -0000	1.8
@@ -1 +1 @@
-ef8d7e5a7e52c282dc369a0935a68d2f  qt-creator-1.2.90-src.tar.gz
+bc5d64922a292cdccb5f9e5e1a33575e  qt-creator-1.3.1-src.tar.gz