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 --- .../potracegui/potracegui-3.5.13.2.spec | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) (limited to 'redhat/applications/potracegui/potracegui-3.5.13.2.spec') diff --git a/redhat/applications/potracegui/potracegui-3.5.13.2.spec b/redhat/applications/potracegui/potracegui-3.5.13.2.spec index 25db4b67d..d8b4709c7 100644 --- a/redhat/applications/potracegui/potracegui-3.5.13.2.spec +++ b/redhat/applications/potracegui/potracegui-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg potracegui %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: TDE frontend for potrace [Trinity] Version: 1.3 -Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Multimedia @@ -64,7 +59,7 @@ remote files (web, ftp, ...) is also supported. %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" @@ -125,15 +120,3 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %changelog -* Fri Aug 16 2013 Francois Andriot - 1.3-4 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot - 1.3-3 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot - 1.3-2 -- Initial release for TDE 3.5.13.1 - -* Sat Dec 03 2011 Francois Andriot - 1.3-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 - -- cgit v1.2.1