From 9750a057f2f36c5b88a5bc53c0a051b605dac061 Mon Sep 17 00:00:00 2001
From: Francois Andriot <francois.andriot@free.fr>
Date: Mon, 7 May 2012 01:06:08 +0200
Subject: RHEL/Fedora: massive updates for Fedora 17 (TDE 3.5.13 entire build)

---
 redhat/kdetoys/trinity-kdetoys-3.5.13.spec | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

(limited to 'redhat/kdetoys')

diff --git a/redhat/kdetoys/trinity-kdetoys-3.5.13.spec b/redhat/kdetoys/trinity-kdetoys-3.5.13.spec
index ebba35cf7..5d94b4637 100644
--- a/redhat/kdetoys/trinity-kdetoys-3.5.13.spec
+++ b/redhat/kdetoys/trinity-kdetoys-3.5.13.spec
@@ -1,17 +1,10 @@
-# Default version for this component
-%if "%{?version}" == ""
-%define version 3.5.13
-%endif
-%define release 2
-
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?_prefix}" != "/usr"
 %define _variant .opt
-%define _docdir %{_prefix}/share/doc
+%define _docdir %{_datadir}/doc
 %endif
 
-# TDE 3.5.12 specific building variables
-BuildRequires: autoconf automake libtool m4
+# TDE 3.5.13 specific building variables
 %define tde_docdir %{_docdir}/kde
 %define tde_includedir %{_includedir}/kde
 %define tde_libdir %{_libdir}/trinity
@@ -20,8 +13,8 @@ BuildRequires: autoconf automake libtool m4
 Summary: K Desktop Environment - Toys and Amusements
 Name: 	 trinity-kdetoys
 Group:	 Amusements/Graphics
-Version: %{?version}
-Release: %{?release}%{?dist}%{?_variant}
+Version: 3.5.13
+Release: 2%{?dist}%{?_variant}
 
 License: GPLv2+
 Source0: kdetoys-%{version}.tar.gz
@@ -33,6 +26,7 @@ URL:		http://www.trinitydesktop.org/
 Prefix:		%{_prefix}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires: autoconf automake libtool m4
 BuildRequires: desktop-file-utils
 BuildRequires: tqtinterface-devel
 BuildRequires: trinity-kdelibs-devel
@@ -62,12 +56,11 @@ and user to be logged-in to KDE.
 # Ugly hack to modify TQT include directory inside autoconf files.
 # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
 %__sed -i admin/acinclude.m4.in \
-  -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \
-  -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g"
-
+  -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \
+  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
 
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
 %__make -f "admin/Makefile.common"
 
 
-- 
cgit v1.2.1