summaryrefslogtreecommitdiffstats
path: root/redhat/kdesdk
diff options
context:
space:
mode:
authoralbator <albator@arcadia.vtf>2011-10-29 23:32:41 +0200
committeralbator <albator@arcadia.vtf>2011-10-29 23:32:41 +0200
commit703986bfe4270bb901f594b92eebb265d04ad8f5 (patch)
treeca0361b20e1cf443754d4104663977e3f0a2077c /redhat/kdesdk
parent5a3c8c66709ef8eeb3708b0eb2732fa9e84d37d3 (diff)
downloadtde-packaging-703986bfe4270bb901f594b92eebb265d04ad8f5.tar.gz
tde-packaging-703986bfe4270bb901f594b92eebb265d04ad8f5.zip
Lot of updates for TDE 3.5.13 (RHEL 5, RHEL 6, Fedora 15)
Diffstat (limited to 'redhat/kdesdk')
-rw-r--r--redhat/kdesdk/trinity-kdesdk-3.5.12.spec6
-rw-r--r--redhat/kdesdk/trinity-kdesdk-3.5.13.spec12
2 files changed, 12 insertions, 6 deletions
diff --git a/redhat/kdesdk/trinity-kdesdk-3.5.12.spec b/redhat/kdesdk/trinity-kdesdk-3.5.12.spec
index 238fe5656..7458317d2 100644
--- a/redhat/kdesdk/trinity-kdesdk-3.5.12.spec
+++ b/redhat/kdesdk/trinity-kdesdk-3.5.12.spec
@@ -50,7 +50,7 @@ Provides: kdesdk3 = %{version}-%{release}
Requires: %{name}-libs = %{version}-%{release}
-BuildRequires: automake libtool
+BuildRequires: libtool
BuildRequires: tqtinterface-devel
BuildRequires: pcre-devel
BuildRequires: trinity-kdelibs-devel
@@ -66,7 +66,7 @@ BuildRequires: libxslt-devel libxml2-devel
BuildRequires: binutils-devel
%endif
BuildRequires: perl
-%{?_with_subversion:BuildRequires: subversion-devel neon-devel}
+BuildRequires: subversion-devel neon-devel
# Obsoletes/Provides
%define cervisia_ver 2.4.7
@@ -99,7 +99,7 @@ Requires: trinity-kdelibs-devel
%package libs
Summary: %{name} runtime libraries
Group: System Environment/Libraries
-Requires: trinity-kdelibs >= %{version}
+Requires: trinity-kdelibs
# helps multilib upgrades
Obsoletes: %{name} < %{version}-%{release}
# include to be paranoid, installing libs-only is still mostly untested -- Rex
diff --git a/redhat/kdesdk/trinity-kdesdk-3.5.13.spec b/redhat/kdesdk/trinity-kdesdk-3.5.13.spec
index 19dae5b0b..2563ec93a 100644
--- a/redhat/kdesdk/trinity-kdesdk-3.5.13.spec
+++ b/redhat/kdesdk/trinity-kdesdk-3.5.13.spec
@@ -26,7 +26,10 @@ Group: User Interface/Desktops
URL: http://www.trinitydesktop.org/
Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr>
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Prefix: %{_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
Source: kdesdk-%{version}.tar.gz
# RedHat Legacy patches
@@ -48,7 +51,9 @@ BuildRequires: desktop-file-utils
BuildRequires: flex
# umbrello
BuildRequires: libxslt-devel libxml2-devel
+%if 0%{?fedora} > 5 || 0%{?rhel} > 4
BuildRequires: binutils-devel
+%endif
BuildRequires: perl
BuildRequires: subversion-devel neon-devel
@@ -111,14 +116,15 @@ cd build
-DBUILD_ALL=ON \
..
-%__make %{?_smp_mflags}
+# Do not use %{?_smp_mflags} !
+%__make
%install
export PATH="%{_bindir}:${PATH}"
%__rm -rf %{buildroot}
-%make_install -C build
+%__make install DESTDIR=%{?buildroot} -C build
desktop-file-install --vendor "" \
--dir %{buildroot}%{_datadir}/applications/kde \