summaryrefslogtreecommitdiffstats
path: root/redhat/kdegraphics
diff options
context:
space:
mode:
authoralbator <albator@arcadia.vtf>2011-09-19 22:17:49 +0200
committeralbator <albator@arcadia.vtf>2011-09-19 22:17:49 +0200
commit7097fba6916585b670bc24ac0275608108848a59 (patch)
tree681694d8d3e61eb1d652ef7009ade92c674a551d /redhat/kdegraphics
parentd20183da14961148333e1f76f794c19bd763c7b0 (diff)
downloadtde-packaging-7097fba6916585b670bc24ac0275608108848a59.tar.gz
tde-packaging-7097fba6916585b670bc24ac0275608108848a59.zip
Updates for TDE 3.5.12 for RHEL5
Signed-off-by: albator <albator@arcadia.vtf>
Diffstat (limited to 'redhat/kdegraphics')
-rw-r--r--redhat/kdegraphics/trinity-kdegraphics-3.5.12.spec16
1 files changed, 13 insertions, 3 deletions
diff --git a/redhat/kdegraphics/trinity-kdegraphics-3.5.12.spec b/redhat/kdegraphics/trinity-kdegraphics-3.5.12.spec
index 2c0405914..512d70952 100644
--- a/redhat/kdegraphics/trinity-kdegraphics-3.5.12.spec
+++ b/redhat/kdegraphics/trinity-kdegraphics-3.5.12.spec
@@ -2,7 +2,7 @@
%if "%{?version}" == ""
%define version 3.5.12
%endif
-%define release 2
+%define release 3
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
@@ -24,12 +24,14 @@ License: GPL
Summary: K Desktop Environment - Graphics Applications
Group: Applications/Multimedia
-Prefix: %{_prefix}
Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr>
URL: http://www.trinitydesktop.org/
+Prefix: %{_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
Source0: kdegraphics-%{version}.tar.gz
# Official TDE patches (from SVN)
@@ -54,6 +56,7 @@ BuildRequires: gphoto2-devel
BuildRequires: sane-backends-devel
BuildRequires: libusb-devel
+
# kgamma
BuildRequires: libXxf86vm-devel
# kuickshow
@@ -62,7 +65,11 @@ BuildRequires: imlib-devel
BuildRequires: OpenEXR-devel
# kpdf
BuildRequires: freetype-devel
+%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
BuildRequires: poppler-qt-devel
+%else
+BuildRequires: poppler-devel
+%endif
BuildRequires: libpaper-devel
# ksvg
BuildRequires: fontconfig-devel
@@ -171,7 +178,7 @@ sed -i kpdf/Makefile \
export PATH="%{_bindir}:${PATH}"
%__rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
+%__make install DESTDIR=%{buildroot}
# locale's
%find_lang %{name} || touch %{name}.lang
@@ -344,6 +351,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%exclude %{_libdir}/libdjvu.so
%changelog
+* Mon Sep 19 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-3
+- Add support for RHEL5
+
* Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-2
- Import to GIT