rpms/qt/devel .cvsignore, 1.47, 1.48 qt-copy-patches-svn_checkout.sh, 1.5, 1.6 qt.spec, 1.228, 1.229 sources, 1.48, 1.49

[Rex Dieter]

Author: rdieter

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

Modified Files:
	.cvsignore qt-copy-patches-svn_checkout.sh qt.spec sources 
Log Message:
* Sun Feb 15 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.0-0.2.rc1
- qt-copy-patches-20090215
- License: +LGPLv2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- .cvsignore	14 Feb 2009 23:42:59 -0000	1.47
+++ .cvsignore	15 Feb 2009 23:50:18 -0000	1.48
@@ -3,3 +3,4 @@
 qt-x11-opensource-src-4.4.3.tar.bz2
 qt-copy-patches-20090205svn.tar.bz2
 qt-x11-opensource-src-4.5.0-rc1.tar.bz2
+qt-copy-patches-20090215svn.tar.bz2


Index: qt-copy-patches-svn_checkout.sh
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt-copy-patches-svn_checkout.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- qt-copy-patches-svn_checkout.sh	5 Feb 2009 19:36:47 -0000	1.5
+++ qt-copy-patches-svn_checkout.sh	15 Feb 2009 23:50:18 -0000	1.6
@@ -7,8 +7,7 @@
 rm -rf $EXPORT_DIR
 
 # trunk tracking qt-4.5 now
-#SVN_ROOT=svn://anonsvn.kde.org/home/kde/trunk/qt-copy
-SVN_ROOT=svn://anonsvn.kde.org/home/kde/branches/qt/4.4
+SVN_ROOT=svn://anonsvn.kde.org/home/kde/trunk/qt-copy
 
 svn export --non-recursive $SVN_ROOT $EXPORT_DIR/
 svn export $SVN_ROOT/patches $EXPORT_DIR/patches


Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.228
retrieving revision 1.229
diff -u -r1.228 -r1.229
--- qt.spec	14 Feb 2009 23:43:00 -0000	1.228
+++ qt.spec	15 Feb 2009 23:50:18 -0000	1.229
@@ -9,10 +9,10 @@
 Name:    qt4
 %endif
 Version: 4.5.0
-Release: 0.rc1.0%{?dist}
+Release: 0.2.rc1%{?dist}
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
-License: GPLv3 with exceptions or GPLv2 with exceptions
+License: LGPLv2 or GPLv3 with exceptions or GPLv2 with exceptions
 Group: System Environment/Libraries
 Url: http://www.trolltech.com/products/qt/
 Source0: ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-%{version}%{?pre}.tar.bz2
@@ -41,7 +41,7 @@
 Patch12: qt-x11-opensource-src-4.5.0-rc1-ppc64.patch
 
 ## qt-copy patches
-#define qt_copy 20090205
+%define qt_copy 20090215
 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}}
@@ -272,9 +272,7 @@
 %setup -q -n qt-x11-opensource-src-%{version}%{?pre} %{?qt_copy:-a 2}
 
 %if 0%{?qt_copy}
-echo "0242" >> patches/DISABLED
 echo "0250" >> patches/DISABLED
-echo "0251" >> patches/DISABLED
 
 test -x apply_patches && ./apply_patches
 %endif
@@ -739,6 +737,10 @@
 
 
 %changelog
+* Sun Feb 15 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.0-0.2.rc1
+- qt-copy-patches-20090215
+- License: +LGPLv2
+
 * Wed Feb 11 2009 Than Ngo <than at redhat.com> - 4.5.0-0.rc1.0
 - 4.5.0 rc1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- sources	14 Feb 2009 23:43:00 -0000	1.48
+++ sources	15 Feb 2009 23:50:18 -0000	1.49
@@ -1,3 +1,4 @@
 d9f511e4b51983b4e10eb58b320416d5  hi128-app-qt4-logo.png
 6dcc0672ff9e60a6b83f95c5f42bec5b  hi48-app-qt4-logo.png
 8eee2774c846fa904e98934d7da6414f  qt-x11-opensource-src-4.5.0-rc1.tar.bz2
+94ae9401e279dc3cbe2b41bf49b3ea44  qt-copy-patches-20090215svn.tar.bz2