From 193ac9dc51fbc8d12aa48fe1191c8512850cc4ff Mon Sep 17 00:00:00 2001 From: Francois Andriot Date: Thu, 9 Aug 2012 12:02:10 +0200 Subject: RHEL/Fedora: add support for MGA2/MDV2011 in many applications --- redhat/applications/knemo/trinity-knemo.spec | 85 +++++++++++++++++----------- 1 file changed, 51 insertions(+), 34 deletions(-) (limited to 'redhat/applications/knemo') diff --git a/redhat/applications/knemo/trinity-knemo.spec b/redhat/applications/knemo/trinity-knemo.spec index 441a78732..3db393ccd 100644 --- a/redhat/applications/knemo/trinity-knemo.spec +++ b/redhat/applications/knemo/trinity-knemo.spec @@ -1,25 +1,32 @@ # Default version for this component %define kdecomp knemo -%define version 0.4.8 -%define release 2 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?_prefix}" != "/usr" +%if "%{?tde_prefix}" != "/usr" %define _variant .opt -%define _docdir %{_datadir}/doc %endif # TDE 3.5.13 specific building variables -BuildRequires: autoconf automake libtool m4 -%define tde_docdir %{_docdir}/kde -%define tde_includedir %{_includedir}/kde -%define tde_libdir %{_libdir}/trinity +%define tde_bindir %{tde_prefix}/bin +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man +%define tde_appdir %{tde_datadir}/applications + +%define tde_tdeappdir %{tde_appdir}/kde +%define tde_tdedocdir %{tde_docdir}/kde +%define tde_tdeincludedir %{tde_includedir}/kde +%define tde_tdelibdir %{tde_libdir}/trinity + +%define _docdir %{tde_docdir} Name: trinity-%{kdecomp} Summary: network interfaces monitor for the Trinity systray -Version: %{?version} -Release: %{?release}%{?dist}%{?_variant} +Version: 0.4.8 +Release: 2%{?dist}%{?_variant} License: GPLv2+ Group: Applications/Utilities @@ -28,14 +35,14 @@ Vendor: Trinity Project Packager: Francois Andriot URL: http://beta.smileaf.org/projects -Prefix: %{_prefix} +Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{kdecomp}-3.5.13.tar.gz BuildRequires: tqtinterface-devel -BuildRequires: trinity-kdelibs-devel -BuildRequires: trinity-kdebase-devel +BuildRequires: trinity-tdelibs-devel +BuildRequires: trinity-tdebase-devel BuildRequires: desktop-file-utils BuildRequires: gettext @@ -59,8 +66,8 @@ Homepage: http://extragear.kde.org/apps/knemo/ # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! %__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" + -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" @@ -68,18 +75,26 @@ Homepage: http://extragear.kde.org/apps/knemo/ %build -export PATH="%{_bindir}:${PATH}" -export LDFLAGS="-L%{_libdir} -I%{_includedir}" +unset QTDIR; . /etc/profile.d/qt.sh +export PATH="%{tde_bindir}:${PATH}" +export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ - --disable-rpath \ - --with-extra-includes=%{_includedir}/tqt + --prefix=%{tde_prefix} \ + --exec-prefix=%{tde_prefix} \ + --bindir=%{tde_bindir} \ + --datadir=%{tde_datadir} \ + --libdir=%{tde_libdir} \ + --mandir=%{tde_mandir} \ + --includedir=%{tde_tdeincludedir} \ + --disable-rpath \ + --with-extra-includes=%{tde_includedir}/tqt %__make %{?_smp_mflags} %install -export PATH="%{_bindir}:${PATH}" +export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} @@ -88,26 +103,28 @@ export PATH="%{_bindir}:${PATH}" %post -touch --no-create %{_datadir}/icons/crystalsvg || : -gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || : +update-desktop-database %{tde_appdir} > /dev/null +touch --no-create %{tde_datadir}/icons/crystalsvg || : +gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : %postun -touch --no-create %{_datadir}/icons/crystalsvg || : -gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || : +update-desktop-database %{tde_appdir} > /dev/null +touch --no-create %{tde_datadir}/icons/crystalsvg || : +gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : %files %defattr(-,root,root,-) -%{tde_libdir}/kcm_knemo.la -%{tde_libdir}/kcm_knemo.so -%{tde_libdir}/kded_knemod.la -%{tde_libdir}/kded_knemod.so -%{_datadir}/applications/kde/kcm_knemo.desktop -%{_datadir}/apps/knemo/eventsrc -%{_datadir}/icons/crystalsvg/*/*/*.png -%{_datadir}/locale/*/LC_MESSAGES/knemod.mo -%{_datadir}/locale/*/LC_MESSAGES/kcm_knemo.mo -%{_datadir}/services/kded/knemod.desktop +%{tde_tdelibdir}/kcm_knemo.la +%{tde_tdelibdir}/kcm_knemo.so +%{tde_tdelibdir}/kded_knemod.la +%{tde_tdelibdir}/kded_knemod.so +%{tde_tdeappdir}/kcm_knemo.desktop +%{tde_datadir}/apps/knemo/eventsrc +%{tde_datadir}/icons/crystalsvg/*/*/*.png +%{tde_datadir}/locale/*/LC_MESSAGES/knemod.mo +%{tde_datadir}/locale/*/LC_MESSAGES/kcm_knemo.mo +%{tde_datadir}/services/kded/knemod.desktop %Changelog -- cgit v1.2.3