RPM: merge redhat directory with master branch

3 files changed, 116 insertions, 90 deletions

diff --git a/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec b/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec
index e17320149..02b6c3b33 100644
--- a/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec
+++ b/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec
@@ -1,53 +1,65 @@
-# Default version for this component
-%define tde_pkg tde-guidance
+#
+# spec file for package tde-guidance (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
-
-# REMOVE KDELIBS4-DEVEL before building !!!!
-
-%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-
-# 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 tde-guidance
+%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}
-
+%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %define __arch_install_post %{nil}
 
-Name:			trinity-%{tde_pkg}
-Summary:		A collection of system administration tools for Trinity
-Version:		0.8.0svn20080103
-Release:		%{?!preversion:9}%{?preversion:8_%{preversion}}%{?dist}%{?_variant}
 
-License:		GPLv2+
-Group:			Applications/Utilities
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	0.8.0svn20080103
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	A collection of system administration tools for Trinity
+Group:		Applications/Utilities
+URL:		http://www.simonzone.com/software/guidance
+
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
 
-Vendor:			Trinity Project
-Packager:		Francois Andriot <[email protected]>
-URL:			http://www.simonzone.com/software/guidance
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <[email protected]>
 
-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:		trinity-%{tde_pkg}-rpmlintrc
 
-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
@@ -56,7 +68,21 @@ BuildRequires:	trinity-pytdeextensions
 BuildRequires:	trinity-libpythonize0-devel
 BuildRequires:	trinity-python-trinity
 BuildRequires:	chrpath
+
+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
 
 # SIP support
 BuildRequires:	sip4-tqt-devel >= 4.10.5
@@ -67,6 +93,53 @@ BuildRequires:	python-tqt-devel
 BuildRequires:	trinity-python-trinity-devel
 BuildRequires:	trinity-pytqt-tools
 
+# LIBXXF86VM support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}xxf86vm-devel
+%endif
+%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} >= 1210
+BuildRequires:	libXxf86vm-devel
+%endif
+
+# XSCREENSAVER support
+#  RHEL 4: disabled
+#  RHEL 6: available in EPEL
+#  RHEL 7: available in NUX
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
+%define with_xscreensaver 1
+
+%if 0%{?fedora} || 0%{?rhel} >= 5
+BuildRequires:	libXScrnSaver-devel
+BuildRequires:	xscreensaver
+BuildRequires:	xscreensaver-base
+BuildRequires:	xscreensaver-extras
+%if 0%{?fedora}
+BuildRequires:	xscreensaver-extras-base
+%endif
+BuildRequires:	xscreensaver-gl-base
+BuildRequires:	xscreensaver-gl-extras
+%endif
+
+%if 0%{?suse_version}
+BuildRequires:	libXScrnSaver-devel
+BuildRequires:	xscreensaver
+BuildRequires:	xscreensaver-data
+BuildRequires:	xscreensaver-data-extra
+%endif
+
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mgaversion} >= 4
+BuildRequires:	%{_lib}xscrnsaver-devel
+%else
+BuildRequires:	%{_lib}xscrnsaver%{?mgaversion:1}-devel
+%endif
+BuildRequires:	xscreensaver
+BuildRequires:	xscreensaver-base
+BuildRequires:	xscreensaver-extrusion
+BuildRequires:	xscreensaver-gl
+%endif
+%endif
+
 Requires:		python-tqt
 Requires:		trinity-python-trinity
 Requires:		trinity-pytdeextensions
@@ -75,13 +148,14 @@ Requires:		python
 Requires:		hwdata
 %endif
 
-Requires:		%{name}-backends = %{version}-%{release}
+Requires:		%{name}-backends = %{?epoch:%{epoch}:}%{version}-%{release}
 
 # POWERMANAGER support (requires HAL)
 #define with_powermanager 1
+Obsoletes:	trinity-tde-guidance-powermanager
 
-Obsoletes:		trinity-guidance < %{version}-%{release}
-Provides:		trinity-guidance = %{version}-%{release}
+Obsoletes:		trinity-guidance < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-guidance = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description
 Guidance currently consists of four programs designed to help you
@@ -130,16 +204,6 @@ or can be run as standalone applications.
 %exclude %{tde_datadir}/apps/guidance/pics/processor.png
 %endif
 
-%post
-touch --no-create %{tde_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
-/sbin/ldconfig || :
-
-%postun
-touch --no-create %{tde_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
-/sbin/ldconfig || :
-
 ##########
 
 %package backends
@@ -150,8 +214,8 @@ Requires:		hwdata
 %endif
 Requires:		python
 
-Obsoletes:		trinity-guidance-backends < %{version}-%{release}
-Provides:		trinity-guidance-backends = %{version}-%{release}
+Obsoletes:		trinity-guidance-backends < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-guidance-backends = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description backends
 This package contains the platform neutral backends used in the
@@ -159,6 +223,7 @@ Guidance configuration tools.
 
 %files backends
 %defattr(-,root,root,-)
+%dir %{python_sitearch}/%{name}
 %{python_sitearch}/%{name}/MicroHAL.py*
 %{python_sitearch}/%{name}/drivedetect.py*
 %{python_sitearch}/%{name}/wineread.py*
@@ -173,11 +238,11 @@ Guidance configuration tools.
 %package powermanager
 Group:			Applications/Utilities
 Summary:		HAL based power manager applet [Trinity]
-Requires:		%{name} = %{version}-%{release}
+Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:		hal
 
-Obsoletes:		trinity-guidance-powermanager < %{version}-%{release}
-Provides:		trinity-guidance-powermanager = %{version}-%{release}
+Obsoletes:		trinity-guidance-powermanager < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:		trinity-guidance-powermanager = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %if "%{tde_prefix}" == "/usr"
 Conflicts:	guidance-power-manager
@@ -205,19 +270,11 @@ suspend using HAL.
 %{tde_datadir}/apps/guidance/pics/processor.png
 %{tde_datadir}/autostart/guidance-power-manager.desktop
 
-%post powermanager
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
-%postun powermanager
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-
 %endif
 
 ##########
 
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
 %debug_package
 %endif
 
@@ -386,5 +443,3 @@ find %{buildroot}%{tde_libdir} -name "*.a" -exec rm -f {} \;
 
 
 %changelog
-* Fri Jul 05 2013 Francois Andriot <[email protected]> - 0.8.0svn20080103-8
-- Initial release for TDE 14.0.0
diff --git a/redhat/applications/tde-guidance/tde-guidance-3.5.13.2.spec b/redhat/applications/tde-guidance/tde-guidance-3.5.13.2.spec
index dc77f43b5..7fbb91222 100644
--- a/redhat/applications/tde-guidance/tde-guidance-3.5.13.2.spec
+++ b/redhat/applications/tde-guidance/tde-guidance-3.5.13.2.spec
@@ -6,11 +6,6 @@
 
 %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-# 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
@@ -32,7 +27,7 @@
 Name:			trinity-%{tde_pkg}
 Summary:		A collection of system administration tools for Trinity
 Version:		0.8.0svn20080103
-Release:		%{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant}
+Release:		%{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}
 
 License:		GPLv2+
 Group:			Applications/Utilities
@@ -469,28 +464,3 @@ find %{buildroot}%{tde_libdir} -name "*.a" -exec rm -f {} \;
 
 
 %changelog
-* Sun May 18 2014 Francois Andriot <[email protected]> - 0.8.0svn20080103-8
-- Backport fixes from R14
-
-* Fri Aug 16 2013 Francois Andriot <[email protected]> - 0.8.0svn20080103-7
-- Build for Fedora 19
-
-* Thu Jun 27 2013 Francois Andriot <[email protected]> - 0.8.0svn20080103-6
-- Work around mountconfig incorrectly handling LABEL tag
-
-* Mon Jun 03 2013 Francois Andriot <[email protected]> - 0.8.0svn20080103-5
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <[email protected]> - 0.8.0svn20080103-4
-- Initial release for TDE 3.5.13.1
-
-* Fri May 11 2012 Francois Andriot <[email protected]> - 0.8.0svn20080103-3
-- Fix Python search dir
-
-* Tue May 01 2012 Francois Andriot <[email protected]> - 0.8.0svn20080103-2
-- Rebuilt for Fedora 17
-- Fix post and postun
-- Fix library locations
-
-* Thu Dec 01 2011 Francois Andriot <[email protected]> - 0.8.0svn20080103-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/tde-guidance/trinity-tde-guidance-rpmlintrc b/redhat/applications/tde-guidance/trinity-tde-guidance-rpmlintrc
new file mode 100644
index 000000000..bd7a50a17
--- /dev/null
+++ b/redhat/applications/tde-guidance/trinity-tde-guidance-rpmlintrc
@@ -0,0 +1 @@
+setBadness('file-contains-buildroot', 0)