diff options
| author | Francois Andriot <francois.andriot@free.fr> | 2012-08-03 13:59:43 +0200 |
|---|---|---|
| committer | Francois Andriot <francois.andriot@free.fr> | 2012-08-03 13:59:43 +0200 |
| commit | be9f9f70d960e0789e024c8285dc681302c3c3f1 (patch) | |
| tree | bc4c568eb13a62af120ba51f9145337541b35be3 /redhat/kdeaddons | |
| parent | 1f76bf54b70463addf27bc503bb58af60dc8ae58 (diff) | |
| download | tde-packaging-be9f9f70d960e0789e024c8285dc681302c3c3f1.tar.gz tde-packaging-be9f9f70d960e0789e024c8285dc681302c3c3f1.zip | |
RHEL/Fedora: adds support for Mandriva 2011 in packaging
Diffstat (limited to 'redhat/kdeaddons')
| -rw-r--r-- | redhat/kdeaddons/trinity-kdeaddons-3.5.13.spec | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/redhat/kdeaddons/trinity-kdeaddons-3.5.13.spec b/redhat/kdeaddons/trinity-kdeaddons-3.5.13.spec index cf8496217..36d377062 100644 --- a/redhat/kdeaddons/trinity-kdeaddons-3.5.13.spec +++ b/redhat/kdeaddons/trinity-kdeaddons-3.5.13.spec @@ -1,14 +1,14 @@ # 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 %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_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} %define tde_tdeappdir %{tde_datadir}/applications/kde %define tde_tdedocdir %{tde_docdir}/kde @@ -34,7 +34,7 @@ Provides: trinity-kdeaddons = %{version}-%{release} Obsoletes: trinity-kdeaddons-extras < %{version}-%{release} Provides: trinity-kdeaddons-extras = %{version}-%{release} -Prefix: %{_prefix} +Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: kdeaddons-%{version}.tar.gz @@ -348,7 +348,11 @@ and various local news sources. %package -n trinity-konq-plugins Summary: plugins for Konqueror, the Trinity file/web/doc browser Group: Applications/Utilities +%if 0%{?mgaversion} || 0%{?mdkversion} +Requires: %{_lib}jpeg8 +%else Requires: libjpeg +%endif Requires: python Requires: rsync #Requires: unison @@ -659,7 +663,7 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" %configure \ - --exec-prefix=%{_prefix} \ + --exec-prefix=%{tde_prefix} \ --bindir=%{tde_bindir} \ --libdir=%{tde_libdir} \ --datadir=%{tde_datadir} \ |