rpms/qt/devel .cvsignore, 1.66, 1.67 qt.spec, 1.355, 1.356 sources, 1.67, 1.68

[Than Ngo]

Author: than

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

Modified Files:
	.cvsignore qt.spec sources 
Log Message:
4.6.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qt/devel/.cvsignore,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- .cvsignore	17 Nov 2009 18:41:21 -0000	1.66
+++ .cvsignore	1 Dec 2009 11:50:53 -0000	1.67
@@ -8,3 +8,4 @@ hi32-phonon-gstreamer.png
 hi48-phonon-gstreamer.png
 hi64-phonon-gstreamer.png
 qt-everywhere-opensource-src-4.6.0-rc1.tar.gz
+qt-everywhere-opensource-src-4.6.0.tar.gz


Index: qt.spec
===================================================================
RCS file: /cvs/extras/rpms/qt/devel/qt.spec,v
retrieving revision 1.355
retrieving revision 1.356
diff -u -p -r1.355 -r1.356
--- qt.spec	17 Nov 2009 18:41:21 -0000	1.355
+++ qt.spec	1 Dec 2009 11:50:53 -0000	1.356
@@ -6,7 +6,6 @@
 
 %define _default_patch_fuzz 3 
 
-%define pre rc1 
 # enable kde-qt integration/patches (currently a no-op)
 %define kde_qt 1
 
@@ -14,13 +13,13 @@ Summary: Qt toolkit
 Name:    qt
 Epoch:   1
 Version: 4.6.0
-Release: 0.6.%{pre}%{?dist}
+Release: 1%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
 Group: System Environment/Libraries
 Url: http://www.qtsoftware.com/
-Source0: http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-%{version}%{?pre:-%{pre}}.tar.gz
+Source0: http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes: qt4 < %{version}-%{release}
 Provides: qt4 = %{version}-%{release}
@@ -388,7 +387,7 @@ Qt libraries used for drawing widgets an
 
 
 %prep
-%setup -q -n qt-everywhere-opensource-src-%{version}%{?pre:-%{pre}}
+%setup -q -n qt-everywhere-opensource-src-%{version}
 
 # don't use -b on mkspec files, else they get installed too.
 # multilib hacks no longer required
@@ -1018,6 +1017,9 @@ fi
 
 
 %changelog
+* Tue Dec 01 2009 Than Ngo <than at redhat.com> - 4.6.0-1
+- 4.6.0
+
 * Tue Nov 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.6.0-0.6.rc1
 - qt-4.6.0-rc1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qt/devel/sources,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- sources	17 Nov 2009 18:41:21 -0000	1.67
+++ sources	1 Dec 2009 11:50:54 -0000	1.68
@@ -7,4 +7,4 @@ d9f511e4b51983b4e10eb58b320416d5  hi128-
 12db12c009b722a6dc141f78feb7e330  hi32-phonon-gstreamer.png
 86c34a1b81d44980b1381f94ed6b7a23  hi48-phonon-gstreamer.png
 153505c71ec021b0a3bd4b74f2492e93  hi64-phonon-gstreamer.png
-56772a3f9128f00504d2b21dbe4186b3  qt-everywhere-opensource-src-4.6.0-rc1.tar.gz
+2a7b5126f2450d8525af355fc4c12ad6  qt-everywhere-opensource-src-4.6.0.tar.gz