RPM: merge redhat directory with master branch

2 files changed, 65 insertions, 59 deletions

diff --git a/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper-14.0.0.spec b/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper-14.0.0.spec
index 36fe098ba..bb0651cf0 100644
--- a/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper-14.0.0.spec
+++ b/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper-14.0.0.spec
@@ -1,50 +1,63 @@
-# Default version for this component
-%define tde_pkg tdeio-umountwrapper
+#
+# spec file for package tdeio-umountwrapper (version R14)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
+#
+
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
 %define tde_version 14.0.0
-
-# 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_pkg tdeio-umountwrapper
+%define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
 %define tde_docdir %{tde_datadir}/doc
 %define tde_includedir %{tde_prefix}/include
 %define tde_libdir %{tde_prefix}/%{_lib}
 %define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/tde
+%define tde_tdeappdir %{tde_datadir}/applications/tde
 %define tde_tdedocdir %{tde_docdir}/tde
 %define tde_tdeincludedir %{tde_includedir}/tde
 %define tde_tdelibdir %{tde_libdir}/trinity
 
-%define _docdir %{tde_docdir}
-
 
-Name:			trinity-%{tde_pkg}
-Summary:		progress dialog for safely removing devices in Trinity.
-Version:		0.2
-Release:		%{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant}
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	0.2
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	Progress dialog for safely removing devices in Trinity
+Group:		Applications/Utilities
+URL:		http://frode.kde.no/misc/tdeio_umountwrapper/
 
-License:		GPLv2+
-Group:			Applications/Utilities
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
 
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://frode.kde.no/misc/tdeio_umountwrapper/
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
 
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 Source1:		media_safelyremove.desktop_tdeio
 
 
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
@@ -52,21 +65,41 @@ BuildRequires:	desktop-file-utils
 Obsoletes:		trinity-kio-umountwrapper < %{version}-%{release}
 Provides:		trinity-kio-umountwrapper = %{version}-%{release}
 
+BuildRequires:	autoconf automake libtool m4
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires:	update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires:	brp-check-trinity
+%endif
+
+
 %description
 Wrapper around tdeio_media_mountwrapper.
 Provides a progress dialog for Safely Removing of devices in Trinity.
 
 
-%if 0%{?suse_version} || 0%{?pclinuxos}
+##########
+
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
 %debug_package
 %endif
 
+##########
+
 
 %prep
 %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"
 
 
@@ -129,9 +162,9 @@ fi
 %doc AUTHORS ChangeLog COPYING NEWS README TODO
 %{tde_bindir}/tdeio_umountwrapper
 %{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdeio-umountwrapper
+%dir %{tde_datadir}/apps/d3lphin
+%dir %{tde_datadir}/apps/d3lphin/servicemenus
 %{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_tdeio-umountwrapper
 
 
 %changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.2-8
-- Initial release for TDE 14.0.0
diff --git a/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper-3.5.13.2.spec b/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper-3.5.13.2.spec
index f83a7fffa..22903f422 100644
--- a/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper-3.5.13.2.spec
+++ b/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper-3.5.13.2.spec
@@ -2,11 +2,6 @@
 %define tde_pkg tdeio-umountwrapper
 %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:		progress dialog for safely removing devices in Trinity.
 Version:		0.2
-Release:		%{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant}
+Release:		%{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}
 
 License:		GPLv2+
 Group:			Applications/Utilities
@@ -66,7 +61,7 @@ Provides a progress dialog for Safely Removing of devices in Trinity.
 %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"
 
 
@@ -133,25 +128,3 @@ fi
 
 
 %changelog
-* Sat Sep 28 2013 Francois Andriot <francois.andriot@free.fr> - 0.2-7
-- Fix inadvertent 'kio' renaming
-
-* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.2-6
-- Build for Fedora 19
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.2-5
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.2-4
-- Initial release for TDE 3.5.13.1
-
-* Sun Jul 08 2012 Francois Andriot <francois.andriot@free.fr> - 0.2-3
-- Add 'desktop' file, to make this program useful :-)
-
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.2-2
-- Rebuilt for Fedora 17
-- Removes post and postun
-
-* Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.2-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-