From f6ce92a24ffe2ccb16db56a14655a01e0caf106a Mon Sep 17 00:00:00 2001 From: albator Date: Tue, 13 Sep 2011 19:34:56 +0200 Subject: Add kdeutils patches from Fedora8. Updated TDE 3.5.12 Spec file, confirmed working on RHEL6 and Fedora15. --- redhat/kdemultimedia/trinity-kdemultimedia-3.5.12.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'redhat/kdemultimedia') diff --git a/redhat/kdemultimedia/trinity-kdemultimedia-3.5.12.spec b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.12.spec index 05a076bd4..16023a89d 100644 --- a/redhat/kdemultimedia/trinity-kdemultimedia-3.5.12.spec +++ b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.12.spec @@ -139,6 +139,10 @@ unset QTDIR || : ; . /etc/profile.d/qt.sh export PATH="%{_bindir}:${PATH}" export LDFLAGS="-L%{_libdir} -I%{_includedir}" +%if 0%{?fedora} > 0 +export CXXFLAGS="${CXXFLAGS} -lDCOP" +%endif + %configure \ --enable-new-ldflags \ --disable-dependency-tracking \ @@ -164,6 +168,7 @@ export LDFLAGS="-L%{_libdir} -I%{_includedir}" %install +export PATH="%{_bindir}:${PATH}" %__rm -rf %{buildroot} %make_install @@ -230,7 +235,6 @@ for f in crystalsvg hicolor locolor ; do done update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : -%if 0%{?libs} %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig @@ -238,10 +242,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %post extras-libs -p /sbin/ldconfig %postun extras-libs -p /sbin/ldconfig -%endif %post extras -%{?libs:/sbin/ldconfig} +/sbin/ldconfig for f in crystalsvg hicolor ; do touch --no-create %{_datadir}/icons/$f 2> /dev/null ||: gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||: @@ -249,7 +252,7 @@ done update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %postun extras -%{?libs:/sbin/ldconfig} +/sbin/ldconfig for f in crystalsvg hicolor ; do touch --no-create %{_datadir}/icons/$f 2> /dev/null ||: gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||: -- cgit v1.2.1