diff options
Diffstat (limited to 'redhat/applications/kdiff3/kdiff3-3.5.13.2.spec')
| -rw-r--r-- | redhat/applications/kdiff3/kdiff3-3.5.13.2.spec | 41 |
1 files changed, 2 insertions, 39 deletions
diff --git a/redhat/applications/kdiff3/kdiff3-3.5.13.2.spec b/redhat/applications/kdiff3/kdiff3-3.5.13.2.spec index 92c2bf2a8..e4099e05b 100644 --- a/redhat/applications/kdiff3/kdiff3-3.5.13.2.spec +++ b/redhat/applications/kdiff3/kdiff3-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg kdiff3 %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: KDiff3 is a utility for comparing and/or merging two or three text files or directories. Version: 0.9.91 -Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -65,7 +60,7 @@ Unicode & UTF-8 support %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" @@ -141,35 +136,3 @@ done %{tde_tdelibdir}/libkdiff3plugin.so %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.9.91-8 -- Build for Fedora 19 - -* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 0.9.91-7 -- Rebuild with NDEBUG option - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.9.91-6 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.91-5 -- Initial release for TDE 3.5.13.1 - -* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.91-4 -- Rebuilt for Fedora 17 -- Fix HTML directory location -- Fix post and postun -- Rename old tq methods that no longer need a unique name [Commit #c7e29c46] -- Remove additional unneeded tq method conversions [Commit #9b57232f] -- Rename obsolete tq methods to standard names [Commit #d654b107] - -* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.91-3 -- Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15 - -* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.91-2 -- Import to GIT - -* Wed Aug 24 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.91-1 -- Correct macro to install under "/opt", if desired - -* Sun Aug 14 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.91-0 -- Initial release for RHEL 6.0 - |