summaryrefslogtreecommitdiffstats
path: root/redhat/applications/kerry/kerry-3.5.13.2.spec
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2018-11-27 21:34:48 +0100
committerFrançois Andriot <albator78@libertysurf.fr>2018-11-27 21:34:48 +0100
commita615d19df88eb2e989316b480519161945dbc7dc (patch)
tree369970b98042998b86c11024598155e037b76fec /redhat/applications/kerry/kerry-3.5.13.2.spec
parent76a93e0011ade1583a1ec672f33411dfd35454f3 (diff)
downloadtde-packaging-a615d19df88eb2e989316b480519161945dbc7dc.tar.gz
tde-packaging-a615d19df88eb2e989316b480519161945dbc7dc.zip
RPM: merge redhat directory with master branch
Diffstat (limited to 'redhat/applications/kerry/kerry-3.5.13.2.spec')
-rw-r--r--redhat/applications/kerry/kerry-3.5.13.2.spec17
1 files changed, 2 insertions, 15 deletions
diff --git a/redhat/applications/kerry/kerry-3.5.13.2.spec b/redhat/applications/kerry/kerry-3.5.13.2.spec
index 09949032e..eb48b72c8 100644
--- a/redhat/applications/kerry/kerry-3.5.13.2.spec
+++ b/redhat/applications/kerry/kerry-3.5.13.2.spec
@@ -1,11 +1,6 @@
# Default version for this component
%define tdecomp kerry
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
# TDE 3.5.13 specific building variables
%define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share
@@ -26,7 +21,7 @@
Name: trinity-%{tdecomp}
Summary: a KDE frontend for the Beagle desktop search daemon [Trinity]
Version: 0.2.1
-Release: 3%{?dist}%{?_variant}
+Release: 3%{?dist}
License: GPLv2+
Group: Applications/Utilities
@@ -79,7 +74,7 @@ filesystems, chat logs, mail and data, RSS and other.
-e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
%__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"
+%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
@@ -151,11 +146,3 @@ update-desktop-database %{tde_appdir} &> /dev/null
%changelog
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.2.1-3
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.2.1-2
-- Initial release for TDE 3.5.13.1
-
-* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 0.2.1-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16