diff options
| author | François Andriot <albator78@libertysurf.fr> | 2018-11-27 21:34:48 +0100 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2018-11-27 21:34:48 +0100 |
| commit | a615d19df88eb2e989316b480519161945dbc7dc (patch) | |
| tree | 369970b98042998b86c11024598155e037b76fec /redhat/applications/knetload/knetload-3.5.13.2.spec | |
| parent | 76a93e0011ade1583a1ec672f33411dfd35454f3 (diff) | |
| download | tde-packaging-a615d19df88eb2e989316b480519161945dbc7dc.tar.gz tde-packaging-a615d19df88eb2e989316b480519161945dbc7dc.zip | |
RPM: merge redhat directory with master branch
Diffstat (limited to 'redhat/applications/knetload/knetload-3.5.13.2.spec')
| -rw-r--r-- | redhat/applications/knetload/knetload-3.5.13.2.spec | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/redhat/applications/knetload/knetload-3.5.13.2.spec b/redhat/applications/knetload/knetload-3.5.13.2.spec index 99fd0807b..f61799be5 100644 --- a/redhat/applications/knetload/knetload-3.5.13.2.spec +++ b/redhat/applications/knetload/knetload-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg knetload %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: a network meter for Kicker [Trinity] Version: 2.3 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -69,7 +64,7 @@ KNetLoad can monitor just about any network device. %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" @@ -135,17 +130,3 @@ done %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 2.3-5 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 2.3-4 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 2.3-3 -- Initial release for TDE 3.5.13.1 - -* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 2.3-2 -- Rebuild for Fedora 17 - -* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 2.3-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 |