rpms/qt4/devel .cvsignore, 1.25, 1.26 qt4.spec, 1.87, 1.88 sources, 1.21, 1.22

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	.cvsignore qt4.spec sources 
Log Message:
* Fri Feb 22 2008 Rex Dieter <rdieter at fedoraproject.org> 4.3.4-1
- qt-4.3.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	19 Feb 2008 17:19:30 -0000	1.25
+++ .cvsignore	22 Feb 2008 21:22:55 -0000	1.26
@@ -1,5 +1,5 @@
 clog
 hi128-app-qt4-logo.png
 hi48-app-qt4-logo.png
-qt-x11-opensource-src-4.3.3.tar.gz
+qt-x11-opensource-src-4.3.4.tar.gz
 qt-copy-patches-20080219svn.tar.bz2


Index: qt4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/devel/qt4.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- qt4.spec	20 Feb 2008 03:53:39 -0000	1.87
+++ qt4.spec	22 Feb 2008 21:22:55 -0000	1.88
@@ -3,11 +3,11 @@
 
 Summary: Qt toolkit
 Name:	 qt4
-Version: 4.3.3
-Release: 9%{?dist}
+Version: 4.3.4
+Release: 1%{?dist}
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
-License: GPLv2 with exceptions or QPL
+License: GPLv3 or GPLv2 with exceptions 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
@@ -234,6 +234,11 @@
 %endif
 
 %if 0%{?qt_copy:1}
+# 204,206,208 don't apply atm, some/most of these are already included -- Rex
+echo "0204" >> patches/DISABLED
+echo "0206" >> patches/DISABLED
+echo "0208" >> patches/DISABLED
+
 test -x apply_patches && ./apply_patches
 %else
 %patch3 -p0
@@ -369,9 +374,6 @@
 rm -rf %{buildroot}%{_qt4_prefix}/doc
 ln -s  ../../share/doc/qt4 %{buildroot}%{_qt4_prefix}/doc
 
-# put LICENSE.* files in %%_qt4_prefix, some apps' configure scripts expect to find them here
-install -p -m644 LICENSE.GPL %{buildroot}%{_qt4_prefix}/
-
 ## Make symlinks in %%_bindir
 %if "%{_bindir}" != "%{_qt4_bindir}"
   mkdir -p %{buildroot}%{_bindir}
@@ -518,9 +520,9 @@
 %defattr(-,root,root,-)
 %doc README* 
 %{!?beta:%doc OPENSOURCE-NOTICE.TXT}
-%doc LICENSE.GPL GPL_EXCEPTION*.TXT
+%doc LICENSE.GPL2 GPL_EXCEPTION*.TXT
+%doc LICENSE.GPL3
 %doc LICENSE.QPL
-%{_qt4_prefix}/LICENSE.GPL
 %if "%{_qt4_libdir}" != "%{_libdir}"
 /etc/ld.so.conf.d/*
 %dir %{_qt4_libdir}
@@ -656,6 +658,9 @@
 
 
 %changelog
+* Fri Feb 22 2008 Rex Dieter <rdieter at fedoraproject.org> 4.3.4-1
+- qt-4.3.4
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 4.3.3-9
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	19 Feb 2008 17:19:30 -0000	1.21
+++ sources	22 Feb 2008 21:22:55 -0000	1.22
@@ -1,4 +1,4 @@
 d9f511e4b51983b4e10eb58b320416d5  hi128-app-qt4-logo.png
 6dcc0672ff9e60a6b83f95c5f42bec5b  hi48-app-qt4-logo.png
-19678fe35170559cd6a6fa531c57799c  qt-x11-opensource-src-4.3.3.tar.gz
+9499101ec54eb7b0de195b3c5e3ffa93  qt-x11-opensource-src-4.3.4.tar.gz
 9a4849a007bd6c8ed64e3cdcb4619cf5  qt-copy-patches-20080219svn.tar.bz2