rpms/qt4/devel qt-copy-patches-svn_checkout.sh, NONE, 1.1 .cvsignore, 1.22, 1.23 qt4.spec, 1.81, 1.82 sources, 1.18, 1.19 qt-x11-preview-opensource-src-4.4.0-tp1-fix-build.patch, 1.1, NONE

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	.cvsignore qt4.spec sources 
Added Files:
	qt-copy-patches-svn_checkout.sh 
Removed Files:
	qt-x11-preview-opensource-src-4.4.0-tp1-fix-build.patch 
Log Message:
* Thu Jan 24 2008 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.3-5
- License: GPLv2 or QPL
- qt-copy patches



--- NEW FILE qt-copy-patches-svn_checkout.sh ---
#!/bin/bash

DATE=$(date +%Y%m%d)
EXPORT_DIR=qt-copy

set -x
rm -rf $EXPORT_DIR

# app
svn export --non-recursive svn://anonsvn.kde.org/home/kde/trunk/qt-copy $EXPORT_DIR/
svn export svn://anonsvn.kde.org/home/kde/trunk/qt-copy/patches $EXPORT_DIR/patches

pushd $EXPORT_DIR
rm -f ../qt-copy-patches-${DATE}svn.tar.bz2
tar cjf ../qt-copy-patches-${DATE}svn.tar.bz2 \
  .applied_patches apply_patches README.qt-copy patches/ 
popd

# cleanup
rm -rf $EXPORT_DIR



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	5 Dec 2007 23:59:37 -0000	1.22
+++ .cvsignore	24 Jan 2008 16:12:21 -0000	1.23
@@ -4,3 +4,4 @@
 qt-x11-opensource-src-4.3.1.tar.gz
 qt-x11-opensource-src-4.3.2.tar.gz
 qt-x11-opensource-src-4.3.3.tar.gz
+qt-copy-patches-20080124svn.tar.bz2


Index: qt4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/devel/qt4.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- qt4.spec	17 Jan 2008 16:03:06 -0000	1.81
+++ qt4.spec	24 Jan 2008 16:12:21 -0000	1.82
@@ -4,10 +4,10 @@
 Summary: Qt toolkit
 Name:	 qt4
 Version: 4.3.3
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 # GPLv2+exceptions(see GPL_EXCEPTIONS*.txt)
-License: GPLv2
+License: GPLv2 or QPL
 Group: System Environment/Libraries
 Url: http://www.trolltech.com/products/qt/
 Source0: ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-%{version}.tar.gz
@@ -19,7 +19,7 @@
 Provides: qt4 = %{version}-%{release}
 %endif
 
-Source1: Trolltech.conf
+Source4: Trolltech.conf
 
 # See http://bugzilla.redhat.com/223663
 %define multilib_archs x86_64 %{ix86} ppc64 ppc s390x s390 sparc64 sparc
@@ -33,6 +33,10 @@
 Patch3: qt-43-aliasing.diff
 
 ## qt-copy patches
+%define qt_copy 20080124
+Source1: qt-copy-patches-svn_checkout.sh
+Source2: qt-copy-patches-%{qt_copy}svn.tar.bz2
+%{?qt_copy:Provides: %{name}-copy = %{qt_copy}}
 
 Source10: qt4-wrapper.sh
 Source11: qt4.sh
@@ -224,13 +228,19 @@
 %if "%{?snap:1}" == "1"
 %setup -q -n qt-x11%{?preview}-opensource-src-%{version}-%{snap}
 %else
-%setup -q -n qt-x11%{?preview}-opensource-src-%{version}%{?beta}
+%setup -q -n qt-x11%{?preview}-opensource-src-%{version}%{?beta} %{?qt_copy:-a 2}
+%endif
+
+%if 0%{?qt_copy:1}
+test -x apply_patches && ./apply_patches
+%else
+%patch3 -p0
 %endif
 
 %patch1 -p1 -b .assistant4
 # don't use -b on mkspec files, else they get installed too.
 %patch2 -p1
-%patch3 -p0
+
 
 # drop -fexceptions from $RPM_OPT_FLAGS
 RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
@@ -421,7 +431,7 @@
 %endif
 
 # Trolltech.conf
-install -p -m644 -D %{SOURCE1} %{buildroot}%{_qt4_sysconfdir}/Trolltech.conf
+install -p -m644 -D %{SOURCE4} %{buildroot}%{_qt4_sysconfdir}/Trolltech.conf
 
 # qt4-logo (generic) icons
 install -p -m644 -D %{SOURCE30} %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/qt4-logo.png
@@ -509,6 +519,7 @@
 %doc README* 
 %{!?beta:%doc OPENSOURCE-NOTICE.TXT}
 %doc LICENSE.GPL GPL_EXCEPTION*.TXT
+%doc LICENSE.QPL
 %{_qt4_prefix}/LICENSE.GPL
 %if "%{_qt4_libdir}" != "%{_libdir}"
 /etc/ld.so.conf.d/*
@@ -641,6 +652,10 @@
 
 
 %changelog
+* Thu Jan 24 2008 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.3-5
+- License: GPLv2 or QPL
+- qt-copy patches
+
 * Thu Jan 17 2008 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.3-4
 - Qt.pc: fix typo for demosdir (use %%_qt4_demosdir)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	5 Dec 2007 23:59:37 -0000	1.18
+++ sources	24 Jan 2008 16:12:21 -0000	1.19
@@ -1,3 +1,4 @@
 d9f511e4b51983b4e10eb58b320416d5  hi128-app-qt4-logo.png
 6dcc0672ff9e60a6b83f95c5f42bec5b  hi48-app-qt4-logo.png
 19678fe35170559cd6a6fa531c57799c  qt-x11-opensource-src-4.3.3.tar.gz
+46c5a25071affc94cff27085aca43164  qt-copy-patches-20080124svn.tar.bz2


--- qt-x11-preview-opensource-src-4.4.0-tp1-fix-build.patch DELETED ---