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/k3b/k3b-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/k3b/k3b-3.5.13.2.spec')
| -rw-r--r-- | redhat/applications/k3b/k3b-3.5.13.2.spec | 44 |
1 files changed, 2 insertions, 42 deletions
diff --git a/redhat/applications/k3b/k3b-3.5.13.2.spec b/redhat/applications/k3b/k3b-3.5.13.2.spec index 052511e2a..851cf978e 100644 --- a/redhat/applications/k3b/k3b-3.5.13.2.spec +++ b/redhat/applications/k3b/k3b-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg k3b %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 @@ -28,7 +23,7 @@ Name: trinity-%{tde_pkg} Summary: CD/DVD burning application Epoch: 1 Version: 1.0.5 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Vendor: Trinity Project Packager: Francois Andriot <francois.andriot@free.fr> @@ -397,7 +392,7 @@ and a generic audio and video file converter. %patch106 -p1 -b .desktopfile %__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" @@ -471,38 +466,3 @@ export PATH="%{tde_bindir}:${PATH}" %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1:1.0.5-1 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1 -- Initial release for TDE 3.5.13.2 - -* Sun Jan 06 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-2 -- Enables FFMPEG support -- Enables LAME support -- Enables MAD support - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1 -- Initial release for TDE 3.5.13.1 -- Remove requirement for resmgr - -* Sat Aug 04 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-5 -- Add support for Mageia 2 and Mandriva 2011 -- Fix DBUS-TQT detection that prevented HAL support -- Adds requirement for resmgr - -* Wed May 09 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4 -- Removes i18 files (built separately) - -* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3 -- Rebuilt for Fedora 17 -- Fix compilation with GCC 4.7 [Bug #958] - -* Sat Nov 05 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2 -- Updates BuildRequires - -* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1 -- Initial release for RHEL 6, RHEL 5 and Fedora 15 - -* Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0 -- Import to GIT |