From be9f9f70d960e0789e024c8285dc681302c3c3f1 Mon Sep 17 00:00:00 2001 From: Francois Andriot Date: Fri, 3 Aug 2012 13:59:43 +0200 Subject: RHEL/Fedora: adds support for Mandriva 2011 in packaging --- redhat/kdeutils/trinity-kdeutils-3.5.13.spec | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'redhat/kdeutils') diff --git a/redhat/kdeutils/trinity-kdeutils-3.5.13.spec b/redhat/kdeutils/trinity-kdeutils-3.5.13.spec index bd99c4d25..3c32f5e12 100755 --- a/redhat/kdeutils/trinity-kdeutils-3.5.13.spec +++ b/redhat/kdeutils/trinity-kdeutils-3.5.13.spec @@ -1,16 +1,16 @@ # 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 %{tde_datadir}/doc %endif # TDE 3.5.13 specific building variables -%define tde_bindir %{_prefix}/bin -%define tde_datadir %{_prefix}/share +%define tde_bindir %{tde_prefix}/bin +%define tde_datadir %{tde_prefix}/share %define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{_prefix}/include -%define tde_libdir %{_prefix}/%{_lib} -%define tde_sbindir %{_prefix}/sbin +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_sbindir %{tde_prefix}/sbin %define tde_tdeappdir %{tde_datadir}/applications/kde %define tde_tdedocdir %{tde_docdir}/kde @@ -30,7 +30,7 @@ Vendor: Trinity Project Packager: Francois Andriot URL: http://www.trinitydesktop.org/ -Prefix: %{_prefix} +Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: kdeutils-%{version}.tar.gz @@ -959,7 +959,8 @@ export PATH="%{tde_bindir}:${PATH}" export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ - --exec-prefix=%{_prefix} \ + --prefix=%{tde_prefix} \ + --exec-prefix=%{tde_prefix} \ --bindir=%{tde_bindir} \ --libdir=%{tde_libdir} \ --datadir=%{tde_datadir} \ -- cgit v1.2.1