summaryrefslogtreecommitdiffstats
path: root/redhat/applications/filelight/filelight-3.5.13.2.spec
diff options
context:
space:
mode:
authorFrançois Andriot <[email protected]>2018-11-27 21:34:48 +0100
committerFrançois Andriot <[email protected]>2018-11-27 21:34:48 +0100
commita615d19df88eb2e989316b480519161945dbc7dc (patch)
tree369970b98042998b86c11024598155e037b76fec /redhat/applications/filelight/filelight-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/filelight/filelight-3.5.13.2.spec')
-rw-r--r--redhat/applications/filelight/filelight-3.5.13.2.spec38
1 files changed, 2 insertions, 36 deletions
diff --git a/redhat/applications/filelight/filelight-3.5.13.2.spec b/redhat/applications/filelight/filelight-3.5.13.2.spec
index 154efd222..f1b71ae47 100644
--- a/redhat/applications/filelight/filelight-3.5.13.2.spec
+++ b/redhat/applications/filelight/filelight-3.5.13.2.spec
@@ -2,11 +2,6 @@
%define tde_pkg filelight
%define tde_version 3.5.13.2
-# 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 specific building variables
%define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share
@@ -26,7 +21,7 @@
Name: trinity-%{tde_pkg}
Summary: Graphical disk usage display
Version: 1.0
-Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}
License: GPLv2+
Group: Applications/Utilities
@@ -63,7 +58,7 @@ directories on your computer.
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%__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"
@@ -137,32 +132,3 @@ done
%lang(sv) %{tde_tdedocdir}/HTML/sv/filelight/
%changelog
-* Fri Aug 16 2013 Francois Andriot <[email protected]> - 1.0-8
-- Build for Fedora 19
-
-* Sun Jul 28 2013 Francois Andriot <[email protected]> - 1.0-7
-- Rebuild with NDEBUG option
-
-* Mon Jun 03 2013 Francois Andriot <[email protected]> - 1.0-6
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <[email protected]> - 1.0-5
-- Initial release for TDE 3.5.13.1
-- Obsoletes package 'filelight-l10n'
-
-* Tue May 01 2012 Francois Andriot <[email protected]> - 1.0-4
-- Rebuilt for Fedora 17
-- Fix HTML directory location
-
-* Sun Oct 30 2011 Francois Andriot <[email protected]> - 1.0-3
-- Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15
-
-* Tue Sep 14 2011 Francois Andriot <[email protected]> - 1.0-2
-- Import to GIT
-
-* Wed Aug 24 2011 Francois Andriot <[email protected]> - 1.0-1
-- Correct macro to install under "/opt", if desired
-
-* Sun Aug 14 2011 Francois Andriot <[email protected]> - 1.0-0
-- Initial release for RHEL 6.0
-