diff --git a/.cvsignore b/.cvsignore index 14da5dd..5756464 100644 --- a/.cvsignore +++ b/.cvsignore @@ -3,3 +3,4 @@ hi48-app-qt4-logo.png 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 diff --git a/qt-copy-patches-svn_checkout.sh b/qt-copy-patches-svn_checkout.sh index 2a64a11..281fbc7 100755 --- a/qt-copy-patches-svn_checkout.sh +++ b/qt-copy-patches-svn_checkout.sh @@ -7,8 +7,7 @@ set -x 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 diff --git a/qt.spec b/qt.spec index 53e24cf..4e76e8d 100644 --- a/qt.spec +++ b/qt.spec @@ -9,10 +9,10 @@ Epoch: 1 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 @@ patch11: qt-x11-opensource-src-4.5.0-rc1-misc.patch 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 @@ Qt libraries which are used for drawing widgets and OpenGL items. %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 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: %changelog +* Sun Feb 15 2009 Rex Dieter - 4.5.0-0.2.rc1 +- qt-copy-patches-20090215 +- License: +LGPLv2 + * Wed Feb 11 2009 Than Ngo - 4.5.0-0.rc1.0 - 4.5.0 rc1 diff --git a/sources b/sources index 0bf9fd6..d903cd3 100644 --- a/sources +++ b/sources @@ -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