summaryrefslogtreecommitdiffstats
path: root/redhat/kdegames
diff options
context:
space:
mode:
authorFrancois Andriot <francois.andriot@free.fr>2012-05-05 11:33:09 +0200
committerFrancois Andriot <francois.andriot@free.fr>2012-05-05 11:33:09 +0200
commitdcfb68136c0561ba4bcbef1336ff6f02b49c8900 (patch)
tree452dfc902693c31d8b5c4a088c63f56878073862 /redhat/kdegames
parentf345812d8248f8a1c6a062cb5af470a9f44b0dc0 (diff)
downloadtde-packaging-dcfb68136c0561ba4bcbef1336ff6f02b49c8900.tar.gz
tde-packaging-dcfb68136c0561ba4bcbef1336ff6f02b49c8900.zip
RHEL/Fedora: updates main components
Diffstat (limited to 'redhat/kdegames')
-rw-r--r--redhat/kdegames/trinity-kdegames-3.5.13.spec16
1 files changed, 8 insertions, 8 deletions
diff --git a/redhat/kdegames/trinity-kdegames-3.5.13.spec b/redhat/kdegames/trinity-kdegames-3.5.13.spec
index a3d0206a3..1c9686f6a 100644
--- a/redhat/kdegames/trinity-kdegames-3.5.13.spec
+++ b/redhat/kdegames/trinity-kdegames-3.5.13.spec
@@ -7,10 +7,10 @@
# 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
+# TDE 3.5.13 specific building variables
BuildRequires: autoconf automake libtool m4
%define tde_docdir %{_docdir}/kde
%define tde_includedir %{_includedir}/kde
@@ -54,7 +54,7 @@ Summary: Development files for %{name}
Group: Development/Libraries
License: LGPLv2
Provides: kdegames3-devel = %{version}-%{release}
-Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
Requires: trinity-kdelibs-devel
%description devel
%{summary}.
@@ -67,7 +67,7 @@ Group: System Environment/Libraries
Requires: trinity-kdelibs
License: LGPLv2
# include to paranoid, installing libs-only is still mostly untested -- Rex
-#Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+#Requires: %{name} = %{version}-%{release}
%description libs
%{summary}.
@@ -80,11 +80,11 @@ License: LGPLv2
# 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"