summaryrefslogtreecommitdiffstats
path: root/redhat/applications/filelight-l10n
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/filelight-l10n
parent76a93e0011ade1583a1ec672f33411dfd35454f3 (diff)
downloadtde-packaging-a615d19df88eb2e989316b480519161945dbc7dc.tar.gz
tde-packaging-a615d19df88eb2e989316b480519161945dbc7dc.zip
RPM: merge redhat directory with master branch
Diffstat (limited to 'redhat/applications/filelight-l10n')
-rw-r--r--redhat/applications/filelight-l10n/filelight-l10n.spec17
1 files changed, 3 insertions, 14 deletions
diff --git a/redhat/applications/filelight-l10n/filelight-l10n.spec b/redhat/applications/filelight-l10n/filelight-l10n.spec
index 9040a00e9..5feb96b8f 100644
--- a/redhat/applications/filelight-l10n/filelight-l10n.spec
+++ b/redhat/applications/filelight-l10n/filelight-l10n.spec
@@ -4,11 +4,6 @@
%define debug_package %{nil}
-# 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
@@ -27,7 +22,7 @@
Name: trinity-%{kdecomp}
Summary: Localization (l10n) for Filelight, disk space usage tool [Trinity]
Version: 1.0
-Release: 2%{?dist}%{?_variant}
+Release: 2%{?dist}
License: GPLv2+
Group: Applications/Utilities
@@ -75,7 +70,7 @@ See the 'filelight' package description for more information.
-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"
@@ -114,10 +109,4 @@ export PATH="%{tde_bindir}:${PATH}"
%defattr(-,root,root,-)
-%Changelog
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 1.0-2
-- Rebuilt for Fedora 17
-- Removes useless post and postun
-
-* Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 1.0-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
+%changelog