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 --- redhat/applications/tdeio-apt/tdeio-apt-3.5.13.2.spec | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'redhat/applications/tdeio-apt/tdeio-apt-3.5.13.2.spec') diff --git a/redhat/applications/tdeio-apt/tdeio-apt-3.5.13.2.spec b/redhat/applications/tdeio-apt/tdeio-apt-3.5.13.2.spec index 316566375..e45848c73 100644 --- a/redhat/applications/tdeio-apt/tdeio-apt-3.5.13.2.spec +++ b/redhat/applications/tdeio-apt/tdeio-apt-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg tdeio-apt %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: An apt-cache ioslave for Trinity Version: 0.13.2 -Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -70,7 +65,7 @@ browsing the packages easier. It provides: %patch1 -p1 -b .ftbfs %__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" @@ -124,9 +119,3 @@ export PATH="%{tde_bindir}:${PATH}" %changelog -* Fri Aug 16 2013 Francois Andriot - 0.13.2-2 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot - 0.13.2-1 -- Initial release for TDE 3.5.13.2 - -- cgit v1.2.1