From a615d19df88eb2e989316b480519161945dbc7dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Tue, 27 Nov 2018 21:34:48 +0100 Subject: RPM: merge redhat directory with master branch --- .../kchmviewer/kchmviewer-3.5.13.2.spec | 25 ++-------------------- 1 file changed, 2 insertions(+), 23 deletions(-) (limited to 'redhat/applications/kchmviewer/kchmviewer-3.5.13.2.spec') diff --git a/redhat/applications/kchmviewer/kchmviewer-3.5.13.2.spec b/redhat/applications/kchmviewer/kchmviewer-3.5.13.2.spec index b8e6589e2..36012a73f 100644 --- a/redhat/applications/kchmviewer/kchmviewer-3.5.13.2.spec +++ b/redhat/applications/kchmviewer/kchmviewer-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg kchmviewer %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 @@ -27,7 +22,7 @@ Name: trinity-%{tde_pkg} Summary: CHM viewer for Trinity Version: 3.1.2 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -78,7 +73,7 @@ support. Correctly detects and shows encoding of any valid chm file. %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -148,19 +143,3 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : %changelog -* Fri Aug 16 2013 Francois Andriot - 3.1.2-5 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot - 3.1.2-4 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot - 3.1.2-3 -- Initial release for TDE 3.5.13.1 - -* Tue May 01 2012 Francois Andriot - 3.1.2-2 -- Rebuilt for Fedora 17 -- Fix post and postun -- Fix HTML directory location - -* Sat Nov 19 2011 Francois Andriot - 3.1.2-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 -- cgit v1.2.1