rpms/qt
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- strip -lsqlite3 from .pc files (#451490)

Browse Source
This commit is contained in:
Rex Dieter 2008-06-14 21:38:08 +00:00
parent 1bbe97aef2
commit 7ac2057db1
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
qt.spec
View File

@ -8,7 +8,7 @@ Name: qt
Name: qt4 Name: qt4
%endif %endif
Version: 4.4.0 Version: 4.4.0
Release: 9%{?dist} Release: 10%{?dist}
# GPLv2 exceptions(see GPL_EXCEPTIONS*.txt) # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
License: GPLv3 or GPLv2 with exceptions or QPL License: GPLv3 or GPLv2 with exceptions or QPL
@ -416,8 +416,8 @@ desktop-file-install \
# strip extraneous dirs/libraries -- Rex # strip extraneous dirs/libraries -- Rex
# safe ones # safe ones
glib2_libs=$(pkg-config --libs glib-2.0 gthread-2.0) 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 \ for dep in -laudio -ldbus-1 -lfreetype -lfontconfig ${glib2_libs} -lmng -ljpeg -lpng -lm -lz -lssl -lcrypto -lsqlite3 \
-L%{_builddir}/qt-x11%{?preview}-all-opensource-src-%{version}%{?pre}/lib ; do -L%{_builddir}/qt-x11%{?preview}-opensource-src-%{version}%{?pre}/lib -L/usr/X11R6/%{_lib} ; do
sed -i -e "s|$dep ||g" %{buildroot}%{_qt4_libdir}/lib*.la ||: 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}/pkgconfig/*.pc
sed -i -e "s|$dep ||g" %{buildroot}%{_qt4_libdir}/*.prl sed -i -e "s|$dep ||g" %{buildroot}%{_qt4_libdir}/*.prl
@ -769,6 +769,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
%changelog %changelog
* Sat Jun 14 2008 Rex Dieter <rdieter@fedoraproject.org> 4.4.0-10
- strip -lsqlite3 from .pc files (#451490)
* Sat Jun 14 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 4.4.0-9 * Sat Jun 14 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 4.4.0-9
- restore -qt4 suffixes - restore -qt4 suffixes

2
qt4-wrapper.sh
View File

@ -1,4 +1,4 @@
#! /bin/bash ! /bin/bash
# #
# In multilib environments there is a preferred architecture, 64 bit over 32 bit in x86_64, # In multilib environments there is a preferred architecture, 64 bit over 32 bit in x86_64,
# 32 bit over 64 bit in ppc64. When a conflict is found between two packages corresponding # 32 bit over 64 bit in ppc64. When a conflict is found between two packages corresponding