rpms/qt4/devel qt4.spec,1.59,1.60

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	qt4.spec 
Log Message:
* Fri Aug 10 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.1-2
- License: GPLv2 (see also GPL_EXCEPTIONS*.txt)
- omit needless %check
- (re)add package review comment/reference



Index: qt4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/devel/qt4.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- qt4.spec	9 Aug 2007 11:32:45 -0000	1.59
+++ qt4.spec	10 Aug 2007 18:59:44 -0000	1.60
@@ -1,9 +1,13 @@
+
+# Fedora Review: http://bugzilla.redhat.com/188180
+
 Summary: Qt toolkit
 Name:	 qt4
 Version: 4.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 
-License: GPL
+# GPLv2+exceptions(see GPL_EXCEPTIONS*.txt)
+License: GPLv2
 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
@@ -53,7 +57,6 @@
 %endif
 
 # See http://bugzilla.redhat.com/196901
-# these should match contents of SOURCE13: 
 %define _qt4_prefix %{_libdir}/qt4
 %define _qt4_bindir %{_qt4_prefix}/bin
 %define _qt4_datadir %{_datadir}/qt4
@@ -381,25 +384,27 @@
 rm -f %{buildroot}%{_qt4_libdir}/lib*.la
 
 %ifarch %{multilib_archs}
+# multilib: qconfig.h
   mv %{buildroot}%{_qt4_headerdir}/Qt/qconfig.h %{buildroot}%{_qt4_headerdir}/QtCore/qconfig-%{_arch}.h
   install -p -m644 -D %{SOURCE5} %{buildroot}%{_qt4_headerdir}/QtCore/qconfig-multilib.h
   ln -sf qconfig-multilib.h %{buildroot}%{_qt4_headerdir}/QtCore/qconfig.h
   ln -sf ../QtCore/qconfig.h %{buildroot}%{_qt4_headerdir}/Qt/qconfig.h
 %endif
 
-## multilib: mkspecs
 %if "%{_qt4_datadir}" != "%{_qt4_prefix}"
-# qt4.(sh|csh), QMAKESPEC
-#install -p -m755 -D %{SOURCE11} %{buildroot}/etc/profile.d/%{name}-%{_arch}.sh
-#install -p -m755 -D %{SOURCE12} %{buildroot}/etc/profile.d/%{name}-%{_arch}.csh
-#sed -i -e "s|@@QMAKESPEC@@|%{platform}|" %{buildroot}/etc/profile.d/%{name}-%{_arch}.*
-# mkspecs 
+# multilib: mkspecs.  TODO: consider moving this to ifarch multilib_archs block above
   mkdir %{buildroot}%{_qt4_prefix}/mkspecs
   mv %{buildroot}%{_qt4_datadir}/mkspecs/{default,linux-g++*,qconfig.pri} \
      %{buildroot}%{_qt4_prefix}/mkspecs/
-  ln -s	%{_qt4_datadir}/mkspecs/common %{buildroot}%{_qt4_prefix}/mkspecs/common
+  ln -s %{_qt4_datadir}/mkspecs/common %{buildroot}%{_qt4_prefix}/mkspecs/common
 %endif
 
+
+# qt4.(sh|csh), currently unused
+#install -p -m755 -D %{SOURCE11} %{buildroot}/etc/profile.d/%{name}-%{_arch}.sh
+#install -p -m755 -D %{SOURCE12} %{buildroot}/etc/profile.d/%{name}-%{_arch}.csh
+#sed -i -e "s|@@QMAKESPEC@@|%{platform}|" %{buildroot}/etc/profile.d/%{name}-%{_arch}.*
+
 %if "%{_qt4_libdir}" != "%{_libdir}"
   mkdir -p %{buildroot}/etc/ld.so.conf.d
   echo "%{_qt4_libdir}" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf
@@ -408,7 +413,7 @@
 # Trolltech.conf
 install -p -m644 -D %{SOURCE1} %{buildroot}%{_qt4_sysconfdir}/Trolltech.conf
 
-# Qt path
+# Qt.pc
 cat >%{buildroot}%{_libdir}/pkgconfig/Qt.pc<<EOF
 prefix=%{_qt4_prefix}
 bindir=%{_qt4_bindir}
@@ -447,26 +452,6 @@
 EOF
 
 
-%check
-# verify %%_qt_* vs qmake -query equivalents
-ERR=0
-PATH=%{buildroot}%{_qt4_bindir}:$PATH
-export PATH
-set -x
-test "%{_qt4_prefix}" == "$(qmake -query QT_INSTALL_PREFIX)" || ERR=1
-test "%{_qt4_bindir}" == "$(qmake -query QT_INSTALL_BINS)" || ERR=1
-test "%{_qt4_datadir}" == "$(qmake -query QT_INSTALL_DATA)" || ERR=1
-test "%{_qt4_demosdir}" == "$(qmake -query QT_INSTALL_DEMOS)" || ERR=1
-test "%{_qt4_docdir}" == "$(qmake -query QT_INSTALL_DOCS)" || ERR=1
-test "%{_qt4_examplesdir}" == "$(qmake -query QT_INSTALL_EXAMPLES)" || ERR=1
-test "%{_qt4_headerdir}" == "$(qmake -query QT_INSTALL_HEADERS)" || ERR=1 
-test "%{_qt4_libdir}" == "$(qmake -query QT_INSTALL_LIBS)" || ERR=1 
-test "%{_qt4_plugindir}" == "$(qmake -query QT_INSTALL_PLUGINS)" || ERR=1
-test "%{_qt4_sysconfdir}" == "$(qmake -query QT_INSTALL_CONFIGURATION)" || ERR=1
-test "%{_qt4_translationdir}" == "$(qmake -query QT_INSTALL_TRANSLATIONS)" || ERR=1
-exit $ERR
-
-
 %clean
 rm -rf %{buildroot}
 
@@ -480,7 +465,8 @@
 %defattr(-,root,root,-)
 %doc README* 
 %{!?beta:%doc OPENSOURCE-NOTICE.TXT}
-%{_qt4_prefix}/LICENSE.*
+%doc LICENSE.GPL GPL_EXCEPTION*.TXT
+%{_qt4_prefix}/LICENSE.GPL
 %if "%{_qt4_libdir}" != "%{_libdir}"
 /etc/ld.so.conf.d/*
 %dir %{_qt4_libdir}
@@ -611,6 +597,11 @@
 
 
 %changelog
+* Fri Aug 10 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.1-2
+- License: GPLv2 (see also GPL_EXCEPTIONS*.txt)
+- omit needless %%check
+- (re)add package review comment/reference
+
 * Thu Aug 09 2007 Than Ngo <than at redhat.com> -  4.3.1-1
 - update to 4.3.1