rpms/qt4/devel qt4.macros,1.4,1.5 qt4.spec,1.56,1.57
Than Ngo (than)
fedora-extras-commits at redhat.com
Tue Aug 7 16:58:35 UTC 2007
Author: than
Update of /cvs/extras/rpms/qt4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22040
Modified Files:
qt4.macros qt4.spec
Log Message:
cleanup
Index: qt4.macros
===================================================================
RCS file: /cvs/extras/rpms/qt4/devel/qt4.macros,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- qt4.macros 18 Jul 2007 17:31:36 -0000 1.4
+++ qt4.macros 7 Aug 2007 16:57:59 -0000 1.5
@@ -1,13 +1,12 @@
-
-%_qt4_bindir %{_qt4_prefix}/bin
-%_qt4_datadir %{_datadir}/qt4
+%_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_docdir %{_docdir}/qt4
+%_qt4_examples %{_qt4_prefix}/examples
%_qt4_headerdir %{_includedir}
-%_qt4_libdir %{_libdir}
-%_qt4_plugindir %{_qt4_prefix}/plugins
-%_qt4_prefix %{_libdir}/qt4
+%_qt4_libdir %{_libdir}
+%_qt4_plugindir %{_qt4_prefix}/plugins
%_qt4_qmake %{_qt4_bindir}/qmake
-%_qt4_sysconfdir %{_sysconfdir}
-%_qt4_translationdir %{_qt4_datadir}/translations
+%_qt4_sysconfdir %{_sysconfdir}
+%_qt4_translationdir %{_qt4_datadir}/translations
Index: qt4.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4/devel/qt4.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- qt4.spec 18 Jul 2007 17:31:36 -0000 1.56
+++ qt4.spec 7 Aug 2007 16:57:59 -0000 1.57
@@ -1,21 +1,11 @@
-
-# Fedora Review
-# http://bugzilla.redhat.com/188180
-
-#define beta rc1
-#define preview -preview
-
-#define snap 20070423
-#define beta snapshot%{snap}
-
Summary: Qt toolkit
Name: qt4
Version: 4.3.0
-Release: 9%{?dist}
+Release: 10%{?dist}
License: GPL
-Group: System Environment/Libraries
-Url: http://www.trolltech.com/products/qt/
+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
@@ -26,7 +16,7 @@
%if "%{name}" != "qt4"
Epoch: 1
Obsoletes: qt4 < %{version}-%{release}
-Provides: qt4 = %{version}-%{release}
+Provides: qt4 = %{version}-%{release}
%endif
Source1: Trolltech.conf
@@ -44,10 +34,6 @@
Source10: qt4-wrapper.sh
Source11: qt4.sh
Source12: qt4.csh
-# /etc/rpm/macros.qt4
-Source13: qt4.macros
-# alternative implementation, using qmake -query ... calls to extract values
-Source14: qt4.macros.qmake
Source20: assistant.desktop
Source21: designer.desktop
@@ -58,37 +44,34 @@
## 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
@@ -139,7 +122,7 @@
%endif
Obsoletes: %{name}-config < %{version}-%{release}
-Provides: %{name}-config = %{version}-%{release}
+Provides: %{name}-config = %{version}-%{release}
## libQtScript Obsoletes libqsa ?
# Obsoletes: qt4-qsa
@@ -159,7 +142,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}
@@ -167,6 +149,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:
@@ -177,6 +160,7 @@
Group: Documentation
Requires: %{name} = %{version}-%{release}
Provides: %{name}-assistant = %{version}-%{release}
+
%description doc
%{summary}. Includes:
Qt Assistant, Qt Demo
@@ -186,7 +170,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}.
@@ -195,7 +180,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}.
@@ -204,7 +190,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}.
@@ -213,7 +200,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}.
@@ -221,6 +209,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.
@@ -245,11 +234,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,
@@ -259,7 +250,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
@@ -363,21 +354,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)
@@ -394,11 +385,10 @@
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
+ 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
@@ -408,20 +398,17 @@
#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
+ 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
@@ -445,6 +432,22 @@
Version: %{version}
EOF
+# rpm macros
+cat >%{buildroot}%{_sysconfdir}/rpm/macros.qt4<<EOF
+%%_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
+
%check
# verify %%_qt_* vs qmake -query equivalents
@@ -610,6 +613,9 @@
%changelog
+* 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
More information about the fedora-extras-commits
mailing list