rpms/qt/devel .cvsignore, 1.30, 1.31 qt.spec, 1.176, 1.177 sources, 1.31, 1.32

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23214

Modified Files:
	.cvsignore qt.spec sources 
Log Message:
* Tue May 06 2008 Rex Dieter <rdieter at fedoraproject.org> 4.4.0-1
- qt-4.4.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	29 Apr 2008 20:03:57 -0000	1.30
+++ .cvsignore	6 May 2008 17:28:32 -0000	1.31
@@ -1,4 +1,4 @@
 hi128-app-qt4-logo.png
 hi48-app-qt4-logo.png
-qt-all-opensource-src-4.4.0-rc1.tar.bz2
 qt-copy-patches-20080429svn.tar.bz2
+qt-x11-opensource-src-4.4.0.tar.bz2


Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -r1.176 -r1.177
--- qt.spec	29 Apr 2008 20:59:51 -0000	1.176
+++ qt.spec	6 May 2008 17:28:32 -0000	1.177
@@ -1,8 +1,8 @@
 
 # Fedora Review: http://bugzilla.redhat.com/188180
 
-%define pre_tag rc1
-%define pre -%{pre_tag}
+#define pre_tag rc1
+#define pre -%{pre_tag}
 
 Summary: Qt toolkit
 %if 0%{?fedora} > 8
@@ -11,13 +11,13 @@
 Name:    qt4
 %endif
 Version: 4.4.0
-Release: 0.6.%{pre_tag}%{?dist}
+Release: 1%{?dist}
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv3 or GPLv2 with exceptions or QPL
 Group: System Environment/Libraries
 Url: http://www.trolltech.com/products/qt/
-Source0: ftp://ftp.trolltech.com/qt/source/qt-all-opensource-src-%{version}%{?pre}.tar.bz2
+Source0: ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-%{version}%{?pre}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if "%{name}" != "qt4"
@@ -295,17 +295,12 @@
 
 %prep
 %if "%{?snap:1}" == "1"
-%setup -q -n qt-all-opensource-src-%{vesion}-%{snap}
+%setup -q -n qt-x11-opensource-src-%{vesion}-%{snap}
 %else
-%setup -q -n qt-all-opensource-src-%{version}%{?pre} %{?qt_copy:-a 2}
+%setup -q -n qt-x11-opensource-src-%{version}%{?pre} %{?qt_copy:-a 2}
 %endif
 
 %if 0%{?qt_copy:1}
-# 204,206,208 don't apply atm, some/most of these are already included -- Rex
-#echo "0204" >> patches/DISABLED
-#echo "0206" >> patches/DISABLED
-#echo "0208" >> patches/DISABLED
-
 test -x apply_patches && ./apply_patches
 %endif
 
@@ -784,6 +779,9 @@
 
 
 %changelog
+* Tue May 06 2008 Rex Dieter <rdieter at fedoraproject.org> 4.4.0-1
+- qt-4.4.0
+
 * Tue Apr 29 2008 Rex Dieter <rdieter at fedoraproject.org> 4.4.0-0.6.rc1
 - -webkit (include in -x11 subpkg), drop separate -webkit-devel
 - omit qt4-wrapper.sh deps (since it's not used atm)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	29 Apr 2008 20:03:57 -0000	1.31
+++ sources	6 May 2008 17:28:32 -0000	1.32
@@ -1,4 +1,4 @@
 d9f511e4b51983b4e10eb58b320416d5  hi128-app-qt4-logo.png
 6dcc0672ff9e60a6b83f95c5f42bec5b  hi48-app-qt4-logo.png
-fde34db6d84632881ff4a53d1b102ff1  qt-all-opensource-src-4.4.0-rc1.tar.bz2
 02aca60ef7cb7c8a09974f0636965577  qt-copy-patches-20080429svn.tar.bz2
+03ee0deb73908c84a7b4d9ceb5f8b3f6  qt-x11-opensource-src-4.4.0.tar.bz2