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/tde-systemsettings/tde-systemsettings-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/tde-systemsettings/tde-systemsettings-3.5.13.2.spec')
| -rw-r--r-- | redhat/applications/tde-systemsettings/tde-systemsettings-3.5.13.2.spec | 29 |
1 files changed, 2 insertions, 27 deletions
diff --git a/redhat/applications/tde-systemsettings/tde-systemsettings-3.5.13.2.spec b/redhat/applications/tde-systemsettings/tde-systemsettings-3.5.13.2.spec index cf9b3a815..c06af35f6 100644 --- a/redhat/applications/tde-systemsettings/tde-systemsettings-3.5.13.2.spec +++ b/redhat/applications/tde-systemsettings/tde-systemsettings-3.5.13.2.spec @@ -4,7 +4,6 @@ # 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 # Currently, menu files under /etc/xdg conflict with KDE4 %define tde_sysconfdir %{tde_prefix}/etc %endif @@ -29,7 +28,7 @@ Name: trinity-tde-systemsettings Summary: easy to use control centre for TDE Version: 0.0svn20070312 -Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -71,7 +70,7 @@ Control Centre with an improved user interface. %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" @@ -144,27 +143,3 @@ update-desktop-database %{tde_tdeappdir} -q &> /dev/null %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.0svn20070312-8 -- Build for Fedora 19 - -* Sat Jun 29 2013 Francois Andriot <francois.andriot@free.fr> - 0.0svn20070312-7 -- Rebuild - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.0svn20070312-6 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.0svn20070312-5 -- Initial release for TDE 3.5.13.1 - -* Wed Jul 11 2012 Francois Andriot <francois.andriot@free.fr> - 0.0svn20070312-4 -- Fix XDG menu directory location (again) - -* Sun Jul 08 2012 Francois Andriot <francois.andriot@free.fr> - 0.0svn20070312-3 -- Updates 'Requires: trinity-guidance' to reflect package renaming - -* Wed Dec 14 2011 Francois Andriot <francois.andriot@free.fr> - 0.0svn20070312-2 -- Fix XDG menu directory location - -* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.0svn20070312-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 - |