rpms/qt/devel qt.spec,1.172,1.173
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Thu Apr 24 12:47:02 UTC 2008
Author: rdieter
Update of /cvs/pkgs/rpms/qt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1320
Modified Files:
qt.spec
Log Message:
* Thu Apr 24 2008 Rex Dieter <rdieter at fedoraproject.org> 4.4.0-0.5.rc1
- strip -lssl -lcrypto from *.pc files too
Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -r1.172 -r1.173
--- qt.spec 8 Apr 2008 02:44:04 -0000 1.172
+++ qt.spec 24 Apr 2008 12:46:25 -0000 1.173
@@ -11,7 +11,7 @@
Name: qt4
%endif
Version: 4.4.0
-Release: 0.4.%{pre_tag}%{?dist}
+Release: 0.5.%{pre_tag}%{?dist}
# GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
License: GPLv3 or GPLv2 with exceptions or QPL
@@ -167,6 +167,10 @@
Requires: libpng-devel
Requires: libjpeg-devel
Requires: pkgconfig
+# -openssl-linked ? -- Rex
+#Requires: openssl-devel
+# -dbus-linked ? -- Rex
+#Requires: dbus-devel
Obsoletes: qt4-designer < %{version}-%{release}
Provides: qt4-designer = %{version}-%{release}
%if "%{name}" != "qt4"
@@ -420,7 +424,7 @@
# strip extraneous dirs/libraries -- 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 \
+for dep in -laudio -ldbus-1 -lfreetype -lfontconfig ${glib2_libs} -lmng -ljpeg -lpng -lm -lz -lssl -lcrypto \
-L%{_builddir}/qt-x11%{?preview}-all-opensource-src-%{version}%{?pre}/lib ; do
sed -i -e "s|$dep ||g" %{buildroot}%{_qt4_libdir}/lib*.la ||:
sed -i -e "s|$dep ||g" %{buildroot}%{_qt4_libdir}/pkgconfig/*.pc
@@ -785,6 +789,9 @@
%changelog
+* Thu Apr 24 2008 Rex Dieter <rdieter at fedoraproject.org> 4.4.0-0.5.rc1
+- strip -lssl -lcrypto from *.pc files too
+
* Tue Apr 08 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.4.0-0.4.rc1
- updated patch for #437440 ([as-IN] Consonant combination issue) by Pravin Satpute
- port the patch to Qt 4.4 (the code moved to harfbuzz) and reenable it
More information about the fedora-extras-commits
mailing list