- 20090224 snapshot

- adjust pkgconfig hackery
This commit is contained in:
Rex Dieter 2009-02-27 19:32:21 +00:00
parent 1dc801d71c
commit eed4343768
3 changed files with 51 additions and 16 deletions

View File

@ -1,5 +1,4 @@
hi128-app-qt4-logo.png
hi48-app-qt4-logo.png
qt-x11-opensource-src-4.4.3.tar.bz2
qt-x11-opensource-src-4.5.0-rc1.tar.bz2
qt-copy-patches-20090220svn.tar.bz2
qt-x11-opensource-src-4.5.0-snapshot-20090224.tar.gz

62
qt.spec
View File

@ -1,8 +1,11 @@
# Fedora Review: http://bugzilla.redhat.com/188180
%define pre -rc1
#define pre rc1
%define snap 20090224
%define pre snapshot-%{snap}
# --no-pch disables precompiled headers, make ccache-friendly
#define pch --no-pch
# configure options
# -no-pch disables precompiled headers, make ccache-friendly
%define no_pch -no-pch
Summary: Qt toolkit
%if 0%{?fedora} > 8
@ -12,7 +15,7 @@ Epoch: 1
Name: qt4
%endif
Version: 4.5.0
Release: 0.7.rc1%{?dist}
Release: 0.8.%{snap}%{?dist}
## for 4.5.0 final:
##License: LGPLv2 or GPLv3 with exceptions
@ -21,8 +24,12 @@ Release: 0.7.rc1%{?dist}
License: GPLv3 with exceptions or GPLv2 with exceptions
Group: System Environment/Libraries
Url: http://www.trolltech.com/products/qt/
Source0: ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-%{version}%{?pre}.tar.bz2
Url: http://www.qtsoftware.com/
%if 0%{?snap:1}
Source0: ftp://ftp.trolltech.no/qt/snapshots/qt-x11-opensource-src-%{version}-snapshot-%{snap}.tar.gz
%else
Source0: ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-%{version}%{?pre:-%{pre}}}.tar.bz2
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if "%{name}" != "qt4"
@ -297,10 +304,13 @@ Qt libraries which are used for drawing widgets and OpenGL items.
%prep
%setup -q -n qt-x11-opensource-src-%{version}%{?pre} %{?qt_copy:-a 2}
%setup -q -n qt-x11-opensource-src-%{version}%{?pre:-%{pre}} %{?qt_copy:-a 2}
%if 0%{?qt_copy}
echo "0250" >> patches/DISABLED
%if 0%{?snap} >= 20090224
echo "0272" >> patches/DISABLED
%endif
test -x apply_patches && ./apply_patches
%endif
@ -313,8 +323,10 @@ test -x apply_patches && ./apply_patches
%endif
%patch5 -p1 -b .bz#437440-as_IN-437440
%patch9 -p1 -b .qgtkstyle
%if 0%{?snap} < 20090224
%patch11 -p1 -b .misc
%patch12 -p1 -b .ppc64
%endif
%patch50 -p1 -b .qhostaddress
@ -385,7 +397,7 @@ fi
-reduce-relocations \
-no-separate-debug-info \
%{?phonon} %{!?phonon:-no-phonon} \
%{?pch} \
%{?no_pch} \
-sm \
-stl \
-system-libmng \
@ -414,11 +426,25 @@ fi
make %{?_smp_mflags}
# snapshot doesn't generate docs by default for some reason
#if 0%{?snap:1}
test -d doc/html || make docs %{?_smp_mflags}
#endif
%install
rm -rf %{buildroot}
make install INSTALL_ROOT=%{buildroot}
# snapshot install_htmldocs install_pchdocs targets broken too, qmake bug?
#if %{?snap:1}
test -d %{buildroot}%{_qt4_docdir}/html || \
cp -a doc/html/ %{buildroot}%{_qt4_docdir}/
test -d %{buildroot}%{_qt4_docdir}/qch || \
cp -a doc/qch/ %{buildroot}%{_qt4_docdir}/
#endif
# Add desktop file(s)
desktop-file-install \
--dir %{buildroot}%{_datadir}/applications \
@ -426,11 +452,16 @@ desktop-file-install \
%{SOURCE20} %{SOURCE21} %{SOURCE22} %{SOURCE23} %{SOURCE24}
## pkg-config
# strip extraneous dirs/libraries -- Rex
# strip extraneous dirs/libraries
# FIXME?: qt-4.5 seems to use Libs.private properly, so this hackery should
# no longer be required -- Rex
# safe ones
glib2_libs=$(pkg-config --libs glib-2.0 gthread-2.0)
for dep in -laudio -ldbus-1 -lfreetype -lfontconfig ${glib2_libs} -lmng -ljpeg -lpng -lm -lz -lssl -lcrypto -lsqlite3 \
-L%{_builddir}/qt-x11%{?preview}-opensource-src-%{version}%{?pre}/lib -L/usr/X11R6/%{_lib} ; do
glib2_libs=$(pkg-config --libs glib-2.0 gobject-2.0 gthread-2.0)
ssl_libs=$(pkg-config --libs openssl)
for dep in \
-laudio -ldbus-1 -lfreetype -lfontconfig ${glib2_libs} \
-ljpeg -lm -lmng -lphonon -lpng ${ssl_libs} -lsqlite3 -lphonon -lz \
-L/usr/X11R6/%{_lib} -L%{_libdir} ; do
sed -i -e "s|$dep ||g" %{buildroot}%{_qt4_libdir}/lib*.la ||:
sed -i -e "s|$dep ||g" %{buildroot}%{_qt4_libdir}/pkgconfig/*.pc
sed -i -e "s|$dep ||g" %{buildroot}%{_qt4_libdir}/*.prl
@ -441,7 +472,8 @@ for dep in -lXrender -lXrandr -lXcursor -lXfixes -lXinerama -lXi -lXft -lXt -lXe
sed -i -e "s|$dep ||g" %{buildroot}%{_qt4_libdir}/pkgconfig/*.pc
sed -i -e "s|$dep ||g" %{buildroot}%{_qt4_libdir}/*.prl
done
# nuke dandling reference(s) to %buildroot
# nuke dangling reference(s) to %buildroot
sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" %{buildroot}%{_qt4_libdir}/*.prl
%if "%{_qt4_docdir}" != "%{_qt4_prefix}/doc"
@ -781,6 +813,10 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
%changelog
* Fri Feb 27 2009 Rex Dieter <rdieter@fedoraproject.org> - 1:4.5.0-0.8.20090224
- 20090224 snapshot
- adjust pkgconfig hackery
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:4.5.0-0.7.rc1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild

View File

@ -1,4 +1,4 @@
d9f511e4b51983b4e10eb58b320416d5 hi128-app-qt4-logo.png
6dcc0672ff9e60a6b83f95c5f42bec5b hi48-app-qt4-logo.png
8eee2774c846fa904e98934d7da6414f qt-x11-opensource-src-4.5.0-rc1.tar.bz2
d371c9807e43528ef188be59549e58e1 qt-copy-patches-20090220svn.tar.bz2
eac497de448bf38c969119ad979ad699 qt-x11-opensource-src-4.5.0-snapshot-20090224.tar.gz