rpms/qt/devel .cvsignore, 1.45, 1.46 qt-copy-patches-svn_checkout.sh, 1.4, 1.5 qt.spec, 1.226, 1.227 sources, 1.46, 1.47
Rex Dieter
rdieter at fedoraproject.org
Thu Feb 5 19:37:17 UTC 2009
Author: rdieter
Update of /cvs/pkgs/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23710
Modified Files:
.cvsignore qt-copy-patches-svn_checkout.sh qt.spec sources
Log Message:
* Thu Feb 05 2009 Rex Dieter <rdieter at fedoraproject.org> 4.4.3-16
- track branches/qt-copy/4.4, and backout previous trunk(qt45) ones
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- .cvsignore 29 Jan 2009 17:57:47 -0000 1.45
+++ .cvsignore 5 Feb 2009 19:36:47 -0000 1.46
@@ -1,4 +1,4 @@
hi128-app-qt4-logo.png
hi48-app-qt4-logo.png
qt-x11-opensource-src-4.4.3.tar.bz2
-qt-copy-patches-20090129svn.tar.bz2
+qt-copy-patches-20090205svn.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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- qt-copy-patches-svn_checkout.sh 5 Feb 2009 19:25:26 -0000 1.4
+++ qt-copy-patches-svn_checkout.sh 5 Feb 2009 19:36:47 -0000 1.5
@@ -11,7 +11,7 @@
SVN_ROOT=svn://anonsvn.kde.org/home/kde/branches/qt/4.4
svn export --non-recursive $SVN_ROOT $EXPORT_DIR/
-svn export $SVN_ROOT $EXPORT_DIR/patches
+svn export $SVN_ROOT/patches $EXPORT_DIR/patches
pushd $EXPORT_DIR
rm -f ../qt-copy-patches-${DATE}svn.tar.bz2
Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -r1.226 -r1.227
--- qt.spec 2 Feb 2009 14:38:38 -0000 1.226
+++ qt.spec 5 Feb 2009 19:36:47 -0000 1.227
@@ -9,7 +9,7 @@
Name: qt4
%endif
Version: 4.4.3
-Release: 15%{?dist}
+Release: 16%{?dist}
# GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
License: GPLv3 with exceptions or GPLv2 with exceptions
@@ -40,7 +40,7 @@
Patch10: qt-x11-opensource-src-4.4.3-im.patch
## qt-copy patches
-%define qt_copy 20090129
+%define qt_copy 20090205
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}}
@@ -274,9 +274,6 @@
echo "0242" >> patches/DISABLED
echo "0250" >> patches/DISABLED
echo "0251" >> patches/DISABLED
-echo "0269" >> patches/DISABLED
-echo "0270" >> patches/DISABLED
-echo "0271" >> patches/DISABLED
test -x apply_patches && ./apply_patches
%endif
@@ -738,6 +735,9 @@
%changelog
+* Thu Feb 05 2009 Rex Dieter <rdieter at fedoraproject.org> 4.4.3-16
+- track branches/qt-copy/4.4, and backout previous trunk(qt45) ones
+
* Mon Feb 02 2009 Than Ngo <than at redhat.com> 4.4.3-15
- disable 0269,0270,0271 patches, it causes issue in systray
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources 29 Jan 2009 17:57:47 -0000 1.46
+++ sources 5 Feb 2009 19:36:47 -0000 1.47
@@ -1,4 +1,4 @@
d9f511e4b51983b4e10eb58b320416d5 hi128-app-qt4-logo.png
6dcc0672ff9e60a6b83f95c5f42bec5b hi48-app-qt4-logo.png
00e00c6324d342a7b0d8653112b4f08c qt-x11-opensource-src-4.4.3.tar.bz2
-9c2c9930560dddd4713aa99af3a5199f qt-copy-patches-20090129svn.tar.bz2
+91aabde62e4b4884e686aac6b7b671f1 qt-copy-patches-20090205svn.tar.bz2
More information about the fedora-extras-commits
mailing list