summaryrefslogtreecommitdiffstats
path: root/redhat/kdenetwork
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/kdenetwork
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/kdenetwork')
-rw-r--r--redhat/kdenetwork/trinity-kdenetwork-3.5.12.spec15
1 files changed, 11 insertions, 4 deletions
diff --git a/redhat/kdenetwork/trinity-kdenetwork-3.5.12.spec b/redhat/kdenetwork/trinity-kdenetwork-3.5.12.spec
index c802d72bf..8f7a72611 100644
--- a/redhat/kdenetwork/trinity-kdenetwork-3.5.12.spec
+++ b/redhat/kdenetwork/trinity-kdenetwork-3.5.12.spec
@@ -2,7 +2,7 @@
%if "%{?version}" == ""
%define version 3.5.12
%endif
-%define release 4
+%define release 5
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
@@ -43,7 +43,9 @@ URL: http://www.trinitydesktop.org/
License: GPLv2
Group: Applications/Internet
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Prefix: %{_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Provides: kdenetwork3 = %{version}-%{release}
@@ -110,7 +112,9 @@ Requires(post): chkconfig
#Requires(hint): samba-client
BuildRequires: avahi-qt3-devel
+%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
BuildRequires: libv4l-devel
+%endif
%if 0%{?console_helper}
Requires: usermode-gtk
@@ -211,9 +215,9 @@ export LDFLAGS="-L%{_libdir} -I%{_includedir}"
export PATH="%{_bindir}:${PATH}"
%__rm -rf %{buildroot}
-%make_install
+%__make install DESTDIR=%{buildroot}
# RHEL6: kppp seems to be not installed by previous command ???
-%make_install -C kppp
+%__make install DESTDIR=%{buildroot} -C kppp
## File lists
@@ -477,6 +481,9 @@ done
%changelog
+* Mon Sep 19 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-5
+- Add support for RHEL5
+
* Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-4
- Import to GIT