rpms/qt/devel .cvsignore, 1.58, 1.59 qt.spec, 1.296, 1.297 sources, 1.59, 1.60

[Kevin Kofler]

Author: kkofler

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

Modified Files:
	.cvsignore qt.spec sources 
Log Message:
* Fri Jun 26 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.5.2-2
- take current qt-copy-patches snapshot (20090626)
- disable patches which are already in 4.5.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/.cvsignore,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- .cvsignore	25 Jun 2009 13:41:31 -0000	1.58
+++ .cvsignore	26 Jun 2009 00:41:07 -0000	1.59
@@ -1,5 +1,5 @@
 hi128-app-qt4-logo.png
 hi48-app-qt4-logo.png
 gstreamer-logo.svg
-qt-copy-patches-20090522svn.tar.bz2
 qt-x11-opensource-src-4.5.2.tar.bz2
+qt-copy-patches-20090626svn.tar.bz2


Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.296
retrieving revision 1.297
diff -u -p -r1.296 -r1.297
--- qt.spec	25 Jun 2009 16:08:08 -0000	1.296
+++ qt.spec	26 Jun 2009 00:41:07 -0000	1.297
@@ -12,7 +12,7 @@ Epoch:   1
 Name:    qt4
 %endif
 Version: 4.5.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -61,8 +61,11 @@ Patch53: qt-x11-opensource-src-4.5.0-fix
 Patch54: qt-x11-opensource-src-4.5.1-mysql_config.patch
 
 ## qt-copy patches
-# undef temporarily to solve whether to package qt-copy, qt vanilla, or qt from gitorious
-#define qt_copy 20090522
+# we'll want to switch to the kde-qt branches, e.g.:
+# http://qt.gitorious.org/+kde-developers/qt/kde-qt/commits/4.5.2-patched
+# once they actually contain all the patches from qt-copy (0283 and 0285 are
+# AWOL)
+%define qt_copy 20090522
 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}}
@@ -362,6 +365,10 @@ Qt libraries used for drawing widgets an
 %if 0%{?qt_copy}
 echo "0234" >> patches/DISABLED
 echo "0250" >> patches/DISABLED
+echo "0273" >> patches/DISABLED
+echo "0279" >> patches/DISABLED
+echo "0281" >> patches/DISABLED
+echo "0282" >> patches/DISABLED
 test -x apply_patches && ./apply_patches
 %endif
 
@@ -901,6 +908,10 @@ fi
 %{_datadir}/icons/hicolor/*/apps/qt4-logo.*
 
 %changelog
+* Fri Jun 26 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.5.2-2
+- take current qt-copy-patches snapshot (20090626)
+- disable patches which are already in 4.5.2
+
 * Thu Jun 25 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.5.2-1
 - Qt 4.5.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/sources,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- sources	25 Jun 2009 13:41:31 -0000	1.59
+++ sources	26 Jun 2009 00:41:07 -0000	1.60
@@ -1,5 +1,5 @@
 d9f511e4b51983b4e10eb58b320416d5  hi128-app-qt4-logo.png
 6dcc0672ff9e60a6b83f95c5f42bec5b  hi48-app-qt4-logo.png
 8e3924f417fea67f72b2105faed2119c  gstreamer-logo.svg
-94ed40390723c75dbe88d80b7fa219e8  qt-copy-patches-20090522svn.tar.bz2
 28a7e8ac9805a6f614d2a27ee1a6ac9d  qt-x11-opensource-src-4.5.2.tar.bz2
+9865efce56f62a441a76626226b5f946  qt-copy-patches-20090626svn.tar.bz2