rpms/qt/devel .cvsignore, 1.50, 1.51 qt.spec, 1.241, 1.242 sources, 1.51, 1.52 qt-x11-opensource-src-4.5.0-rc1-misc.patch, 1.2, NONE qt-x11-opensource-src-4.5.0-rc1-ppc64.patch, 1.1, NONE

[Than Ngo]

Author: than

Update of /cvs/extras/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11522

Modified Files:
	.cvsignore qt.spec sources 
Removed Files:
	qt-x11-opensource-src-4.5.0-rc1-misc.patch 
	qt-x11-opensource-src-4.5.0-rc1-ppc64.patch 
Log Message:
4.5.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qt/devel/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- .cvsignore	27 Feb 2009 19:32:21 -0000	1.50
+++ .cvsignore	3 Mar 2009 11:14:33 -0000	1.51
@@ -2,3 +2,5 @@
 hi48-app-qt4-logo.png
 qt-copy-patches-20090220svn.tar.bz2
 qt-x11-opensource-src-4.5.0-snapshot-20090224.tar.gz
+qt-x11-opensource-src-4.5.0.tar.bz2
+qt-copy-patches-20090303svn.tar.bz2


Index: qt.spec
===================================================================
RCS file: /cvs/extras/rpms/qt/devel/qt.spec,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -r1.241 -r1.242
--- qt.spec	1 Mar 2009 20:52:19 -0000	1.241
+++ qt.spec	3 Mar 2009 11:14:34 -0000	1.242
@@ -1,7 +1,4 @@
 # Fedora Review: http://bugzilla.redhat.com/188180
-#define pre rc1
-%define snap 20090224
-%define pre snapshot-%{snap}
 
 # configure options
 # -no-pch disables precompiled headers, make ccache-friendly
@@ -15,21 +12,16 @@
 Name:    qt4
 %endif
 Version: 4.5.0
-Release: 0.8.%{snap}%{?dist}
+Release: 1%{?dist}
 
 ## for 4.5.0 final:
 ##License: LGPLv2 or GPLv3 with exceptions
 ## but, until then,
 # see GPL_EXCEPTIONS*.txt 
 License: GPLv3 with exceptions or GPLv2 with exceptions
-
 Group: System Environment/Libraries
 Url: http://www.qtsoftware.com/
-%if 0%{?snap:1}
-Source0: ftp://ftp.trolltech.no/qt/snapshots/qt-x11-opensource-src-%{version}-snapshot-%{snap}.tar.gz 
-%else
-Source0: ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-%{version}%{?pre:-%{pre}}}.tar.bz2
-%endif
+Source0: ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if "%{name}" != "qt4"
@@ -51,15 +43,13 @@
 # under GNOME, default to QGtkStyle if available
 # (otherwise fall back to QCleanlooksStyle)
 Patch9: qt-x11-opensource-src-4.4.0-qgtkstyle.patch
-patch11: qt-x11-opensource-src-4.5.0-rc1-misc.patch
-Patch12: qt-x11-opensource-src-4.5.0-rc1-ppc64.patch
 
 ## upstreamable bits
 # http://bugzilla.redhat.com/485677
 Patch50: qt-x11-opensource-src-4.5.0-rc1-qhostaddress.patch
 
 ## qt-copy patches
-%define qt_copy 20090220
+%define qt_copy 20090303
 Source1: qt-copy-patches-svn_checkout.sh
 %{?qt_copy:Source2: qt-copy-patches-%{qt_copy}svn.tar.bz2}
 %{?qt_copy:Provides: qt-copy = %{qt_copy}}
@@ -304,14 +294,11 @@
 
 
 %prep
-%setup -q -n qt-x11-opensource-src-%{version}%{?pre:-%{pre}} %{?qt_copy:-a 2}
+%setup -q -n qt-x11-opensource-src-%{version} %{?qt_copy:-a 2}
 
 %if 0%{?qt_copy}
 echo "0250" >> patches/DISABLED
-%if 0%{?snap} >= 20090224
 echo "0272" >> patches/DISABLED
-%endif
-
 test -x apply_patches && ./apply_patches
 %endif
 
@@ -323,10 +310,6 @@
 %endif
 %patch5 -p1 -b .bz#437440-as_IN-437440
 %patch9 -p1 -b .qgtkstyle
-%if 0%{?snap} < 20090224
-%patch11 -p1 -b .misc
-%patch12 -p1 -b .ppc64
-%endif
 
 %patch50 -p1 -b .qhostaddress
 
@@ -370,11 +353,6 @@
 
 %build
 
-# workaround snapshot "can't find libQtXml.so.4" in docs generation
-#if 0%{?snap:1}
-export LD_LIBRARY_PATH="`pwd`/lib:$LD_LIBRARY_PATH"
-#endif
-
 # build shared, threaded (default) libraries
 ./configure -v \
   -confirm-license \
@@ -431,25 +409,12 @@
 
 make %{?_smp_mflags}
 
-# snapshot doesn't generate docs by default for some reason 
-#if 0%{?snap:1}
-test -d doc/html || make docs
-#endif
-
 
 %install
 rm -rf %{buildroot}
 
 make install INSTALL_ROOT=%{buildroot}
 
-# snapshot install_htmldocs install_pchdocs targets broken too, qmake bug?
-#if %{?snap:1}
-test -d %{buildroot}%{_qt4_docdir}/html || \
-  cp -a doc/html/ %{buildroot}%{_qt4_docdir}/
-test -d %{buildroot}%{_qt4_docdir}/qch || \
-  cp -a doc/qch/  %{buildroot}%{_qt4_docdir}/
-#endif
-
 # Add desktop file(s)
 desktop-file-install \
   --dir %{buildroot}%{_datadir}/applications \
@@ -818,6 +783,9 @@
 
 
 %changelog
+* Tue Mar 03 2009 Than Ngo <than at redhat.com> - 4.5.0-1
+- 4.5.0
+
 * Fri Feb 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:4.5.0-0.8.20090224
 - 20090224 snapshot
 - adjust pkgconfig hackery


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qt/devel/sources,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- sources	27 Feb 2009 19:32:21 -0000	1.51
+++ sources	3 Mar 2009 11:14:34 -0000	1.52
@@ -1,4 +1,4 @@
 d9f511e4b51983b4e10eb58b320416d5  hi128-app-qt4-logo.png
 6dcc0672ff9e60a6b83f95c5f42bec5b  hi48-app-qt4-logo.png
-d371c9807e43528ef188be59549e58e1  qt-copy-patches-20090220svn.tar.bz2
-eac497de448bf38c969119ad979ad699  qt-x11-opensource-src-4.5.0-snapshot-20090224.tar.gz
+55e8c74a89e1bc128a5a6f1ff6b8b5ba  qt-x11-opensource-src-4.5.0.tar.bz2
+fcc348cd5997c978e882849bad65b1c0  qt-copy-patches-20090303svn.tar.bz2


--- qt-x11-opensource-src-4.5.0-rc1-misc.patch DELETED ---


--- qt-x11-opensource-src-4.5.0-rc1-ppc64.patch DELETED ---