rpms/qt4/F-7 .cvsignore, 1.17, 1.18 qt4.spec, 1.48, 1.49 sources, 1.13, 1.14

Rex Dieter (rdieter) fedora-extras-commits at redhat.com
Mon Aug 13 00:02:12 UTC 2007 

Author: rdieter

Update of /cvs/pkgs/rpms/qt4/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32569

Modified Files:
	.cvsignore qt4.spec sources 
Log Message:
sync w/rawhide (qt4-4.3.1)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/F-7/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	4 Jun 2007 15:06:38 -0000	1.17
+++ .cvsignore	13 Aug 2007 00:01:38 -0000	1.18
@@ -1,2 +1,3 @@
 clog
 qt-x11-opensource-src-4.3.0.tar.gz
+qt-x11-opensource-src-4.3.1.tar.gz


Index: qt4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/F-7/qt4.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- qt4.spec	21 Jul 2007 21:27:42 -0000	1.48
+++ qt4.spec	13 Aug 2007 00:01:38 -0000	1.49
@@ -1,32 +1,22 @@
 
-# Fedora Review
-# http://bugzilla.redhat.com/188180
-
-#define beta rc1
-#define preview -preview
-
-#define snap 20070423
-#define beta snapshot%{snap}
+# Fedora Review: http://bugzilla.redhat.com/188180
 
 Summary: Qt toolkit
 Name:	 qt4
-Version: 4.3.0
-Release: 9%{?dist}.1
+Version: 4.3.1
+Release: 2%{?dist}
 
-License: GPL
-Group: 	 System Environment/Libraries
-Url:   	 http://www.trolltech.com/products/qt/
-%if "%{?snap:1}" == "1"
-Source0: ftp://ftp.trolltech.com/qt/snapshots/qt-x11-opensource-src-%{version}-%{snap}.tar.bz2
-%else
-Source0: ftp://ftp.trolltech.com/qt/source/qt-x11%{?preview}-opensource-src-%{version}%{?beta}.tar.gz
-%endif
+# 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
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if "%{name}" != "qt4"
 Epoch: 1
 Obsoletes: qt4 < %{version}-%{release}
-Provides:  qt4 = %{version}-%{release}
+Provides: qt4 = %{version}-%{release}
 %endif
 
 Source1: Trolltech.conf
@@ -44,8 +34,6 @@
 Source10: qt4-wrapper.sh
 Source11: qt4.sh
 Source12: qt4.csh
-# /etc/rpm/macros.qt4
-Source13: qt4.macros
 
 Source20: assistant.desktop
 Source21: designer.desktop
@@ -56,37 +44,33 @@
 ## optional plugin bits
 # set to -no-sql-<driver> to disable
 # set to -qt-sql-<driver> to enable *in* qt library
-#if 0%{?fedora} > 3 || 0%{?rhel} > 3
-%define mysql  -plugin-sql-mysql
-#endif
-%define odbc   -plugin-sql-odbc 
-%define psql   -plugin-sql-psql 
+%define mysql -plugin-sql-mysql
+%define odbc -plugin-sql-odbc 
+%define psql -plugin-sql-psql 
 %define sqlite -plugin-sql-sqlite 
 
 # undefine to disable these
-%define nas     -system-nas-sound
+%define nas -system-nas-sound
 %if 0%{?fedora} > 4 || 0%{?rhel} > 4
-%define qdbus	-qdbus
+%define qdbus -qdbus
 BuildRequires: dbus-devel >= 0.62
 %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
-%define _qt4_demosdir	%{_qt4_prefix}/demos
-%define _qt4_docdir	%{_docdir}/qt4
+%define _qt4_prefix %{_libdir}/qt4
+%define _qt4_bindir %{_qt4_prefix}/bin
+%define _qt4_datadir %{_datadir}/qt4
+%define _qt4_demosdir %{_qt4_prefix}/demos
+%define _qt4_docdir %{_docdir}/qt4
 %define _qt4_examplesdir %{_qt4_prefix}/examples
-%define _qt4_headerdir 	%{_includedir} 
-%define _qt4_libdir	%{_libdir}
-%define _qt4_plugindir	%{_qt4_prefix}/plugins
-%define _qt4_sysconfdir	%{_sysconfdir}
+%define _qt4_headerdir %{_includedir} 
+%define _qt4_libdir %{_libdir}
+%define _qt4_plugindir %{_qt4_prefix}/plugins
+%define _qt4_sysconfdir %{_sysconfdir}
 %define _qt4_translationdir %{_qt4_datadir}/translations
 
 %if "%{_qt4_libdir}" != "%{_libdir}"
-# needed for runtime, as well as pre,post
-Prereq:  /etc/ld.so.conf.d
+Prereq: /etc/ld.so.conf.d
 %endif
 
 BuildRequires: cups-devel
@@ -137,7 +121,7 @@
 %endif
 
 Obsoletes: %{name}-config < %{version}-%{release}
-Provides:  %{name}-config = %{version}-%{release}
+Provides: %{name}-config = %{version}-%{release}
 ## libQtScript Obsoletes libqsa ?
 # Obsoletes: qt4-qsa 
 
@@ -157,7 +141,6 @@
 Requires: libjpeg-devel
 Requires: pkgconfig
 #Requires: glib2-devel
-## %{_sysconfdir}/rpm/macros.qt4
 Requires: rpm
 Obsoletes: %{name}-designer < %{version}-%{release}
 Provides:  %{name}-designer = %{version}-%{release}
@@ -165,6 +148,7 @@
 Obsoletes: qt4-devel < %{version}-%{release}
 Provides:  qt4-devel = %{version}-%{release}
 %endif
+
 %description devel
 This package contains the files necessary to develop
 applications using the Qt toolkit.  Includes:
@@ -175,6 +159,7 @@
 Group: Documentation
 Requires: %{name} = %{version}-%{release}
 Provides: %{name}-assistant = %{version}-%{release}
+
 %description doc
 %{summary}.  Includes:
 Qt Assistant, Qt Demo
@@ -184,7 +169,8 @@
 Group: System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
 Obsoletes: %{name}-ODBC < %{version}-%{release}
-Provides:  %{name}-ODBC = %{version}-%{release}
+Provides: %{name}-ODBC = %{version}-%{release}
+
 %description odbc 
 %{summary}.
 
@@ -193,7 +179,8 @@
 Group: System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
 Obsoletes: %{name}-MySQL < %{version}-%{release}
-Provides:  %{name}-MySQL = %{version}-%{release}
+Provides: %{name}-MySQL = %{version}-%{release}
+
 %description mysql 
 %{summary}.
 
@@ -202,7 +189,8 @@
 Group: System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
 Obsoletes: %{name}-PostgreSQL < %{version}-%{release}
-Provides:  %{name}-PostgreSQL = %{version}-%{release}
+Provides: %{name}-PostgreSQL = %{version}-%{release}
+
 %description postgresql 
 %{summary}.
 
@@ -211,7 +199,8 @@
 Group: System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
 Obsoletes: %{name}-SQLite < %{version}-%{release}
-Provides:  %{name}-SQLite = %{version}-%{release}
+Provides: %{name}-SQLite = %{version}-%{release}
+
 %description sqlite 
 %{summary}.
 
@@ -219,6 +208,7 @@
 Summary: Qt GUI-related libraries
 Group: System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
+
 %description x11
 Qt libraries which are used for drawing widgets and OpenGL items.
 
@@ -243,11 +233,13 @@
 %else
 %define platform linux-g++
 %endif
+
 sed -i \
   -e "s|-O2|$RPM_OPT_FLAGS|g" \
   -e "s|g++.conf|g++-multilib.conf|g" mkspecs/%{platform}/qmake.conf
+
 sed -e "s|^QMAKE_CFLAGS_RELEASE|#QMAKE_CFLAGS_RELEASE|g" \
- mkspecs/common/g++.conf > mkspecs/common/g++-multilib.conf
+  mkspecs/common/g++.conf > mkspecs/common/g++-multilib.conf
   
 ## FIXME, http://bugzilla.redhat.com/230224
 # On the surface, looks like a good idea to strip -I/usr/include, -L/usr/lib, 
@@ -257,7 +249,7 @@
 #sed -i -e "s|^QMAKE_INCDIR_QT.*=.*|QMAKE_INCDIR_QT       =|" mkspecs/common/linux.conf
 #endif
 %if "%{_qt4_libdir}" == "%{_libdir}"
-sed -i -e "s|^QMAKE_LIBDIR_QT.*=.*|QMAKE_LIBDIR_QT       =|" mkspecs/common/linux.conf
+  sed -i -e "s|^QMAKE_LIBDIR_QT.*=.*|QMAKE_LIBDIR_QT       =|" mkspecs/common/linux.conf
 %endif
 
 # undefine QMAKE_STRIP, so we get useful -debuginfo pkgs
@@ -361,21 +353,21 @@
 
 ## Make symlinks in %%_bindir
 %if "%{_bindir}" != "%{_qt4_bindir}"
-mkdir -p %{buildroot}%{_bindir}
-pushd %{buildroot}%{_qt4_bindir}
-for i in *; do
-  case "${i}" in
-    assistant|designer|linguist|lrelease|lupdate|moc|qmake|qtconfig|qtdemo|uic)
-      LINK="${i}-qt4"
-      ln -s "${i}" "%{buildroot}%{_qt4_bindir}/${LINK}"
-      ;;
-    *)
-      LINK="${i}"
-      ;;
-  esac
-  install -p -m755 -D %{SOURCE10} %{buildroot}%{_bindir}/${LINK}
-done
-popd
+  mkdir -p %{buildroot}%{_bindir}
+  pushd %{buildroot}%{_qt4_bindir}
+  for i in *; do
+    case "${i}" in
+      assistant|designer|linguist|lrelease|lupdate|moc|qmake|qtconfig|qtdemo|uic)
+        LINK="${i}-qt4"
+        ln -s "${i}" "%{buildroot}%{_qt4_bindir}/${LINK}"
+        ;;
+      *)
+        LINK="${i}"
+        ;;
+    esac
+    install -p -m755 -D %{SOURCE10} %{buildroot}%{_bindir}/${LINK}
+  done
+  popd
 %endif
 
 # _debug lib symlinks (see bug #196513)
@@ -392,38 +384,36 @@
 rm -f %{buildroot}%{_qt4_libdir}/lib*.la
 
 %ifarch %{multilib_archs}
-## multilib: qconfig
-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
+# 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
+# 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
+%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}.*
-# mkspecs 
-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
-%endif
 
 %if "%{_qt4_libdir}" != "%{_libdir}"
-mkdir -p %{buildroot}/etc/ld.so.conf.d
-echo "%{_qt4_libdir}" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf
+  mkdir -p %{buildroot}/etc/ld.so.conf.d
+  echo "%{_qt4_libdir}" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf
 %endif
 
-# rpm macros
-install -p -m644 -D %{SOURCE13} %{buildroot}%{_sysconfdir}/rpm/macros.qt4
-
 # 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}
@@ -443,25 +433,23 @@
 Version: %{version}
 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
+# rpm macros
+mkdir -p %{buildroot}%{_sysconfdir}/rpm
+cat >%{buildroot}%{_sysconfdir}/rpm/macros.qt4<<EOF
+%%_qt4_version %{version}
+%%_qt4_prefix %%{_libdir}/qt4
+%%_qt4_bindir %%{_qt4_prefix}/bin
+%%_qt4_datadir %%{_datadir}/qt4
+%%_qt4_demosdir %%{_qt4_prefix}/demos
+%%_qt4_docdir %%{_docdir}/qt4
+%%_qt4_examples %%{_qt4_prefix}/examples
+%%_qt4_headerdir %%{_includedir}
+%%_qt4_libdir %%{_libdir}
+%%_qt4_plugindir %%{_qt4_prefix}/plugins
+%%_qt4_qmake %%{_qt4_bindir}/qmake
+%%_qt4_sysconfdir %%{_sysconfdir}
+%%_qt4_translationdir %%{_qt4_datadir}/translations
+EOF
 
 
 %clean
@@ -477,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}
@@ -608,6 +597,20 @@
 
 
 %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
+
+* Wed Aug 08 2007 Than Ngo <than at redhat.com> 4.3.0-11
+- add %%_qt4_version
+
+* Tue Aug 07 2007 Than Ngo <than at redhat.com> 4.3.0-10
+- cleanup
+
 * Sun Jul 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.0-9
 - multilib broken: qconfig.h (#248768)
 - +%%_qt4_demosdir,%%_qt4_examplesdir


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/F-7/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	4 Jun 2007 15:06:38 -0000	1.13
+++ sources	13 Aug 2007 00:01:38 -0000	1.14
@@ -1 +1 @@
-8012acea71b35c18247bd92c4721589d  qt-x11-opensource-src-4.3.0.tar.gz
+ec255dcc2b30f5efe0ded85ae8a75e13  qt-x11-opensource-src-4.3.1.tar.gz

More information about the fedora-extras-commits mailing list