summaryrefslogtreecommitdiffstats
path: root/redhat/dependencies/tqt3/tqt3.spec
diff options
context:
space:
mode:
Diffstat (limited to 'redhat/dependencies/tqt3/tqt3.spec')
-rw-r--r--redhat/dependencies/tqt3/tqt3.spec4
1 files changed, 2 insertions, 2 deletions
diff --git a/redhat/dependencies/tqt3/tqt3.spec b/redhat/dependencies/tqt3/tqt3.spec
index c73abd7fd..5feba7a23 100644
--- a/redhat/dependencies/tqt3/tqt3.spec
+++ b/redhat/dependencies/tqt3/tqt3.spec
@@ -328,7 +328,6 @@ Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
Requires: coreutils
Requires: fontconfig >= 2.0
-Requires: /etc/ld.so.conf.d
%description -n %{libtqt3}-mt
This is the Trolltech TQt library, version 3. It's necessary for
@@ -1291,11 +1290,12 @@ echo "sle_version = %{?sle_version}"
%endif
# fix variables in 'qmake.conf'
+distrib_cflags="$(rpm -E %optflags|sed -e "s/_FORTIFY_SOURCE=3/_FORTIFY_SOURCE=2/")"
%__sed -i mkspecs/*/qmake.conf \
-e "s|^QMAKE_INCDIR_TQT.*|QMAKE_INCDIR_TQT = %{_includedir}/tqt3|" \
-e "s|\$(QTDIR)|/usr|g" \
-e "s|-lqt|-ltqt|g" \
- -e "s|^QMAKE_CFLAGS =.*|QMAKE_CFLAGS = %{?optflags} -pipe -fvisibility=hidden -fvisibility-inlines-hidden|" \
+ -e "s|^QMAKE_CFLAGS =.*|QMAKE_CFLAGS = ${distrib_cflags} -pipe -fvisibility=hidden -fvisibility-inlines-hidden|" \
-e "s|^QMAKE_INCDIR =.*|QMAKE_INCDIR = %{_includedir}|" \
-e "s|^QMAKE_LIBDIR =.*|QMAKE_LIBDIR = %{_libdir}|" \
-e "s|^QMAKE_RPATH = .*|QMAKE_RPATH =|" \