RPM: merge redhat directory with master branch

2 files changed, 74 insertions, 65 deletions

diff --git a/redhat/applications/basket/basket-14.0.0.spec b/redhat/applications/basket/basket-14.0.0.spec
index 83e6196fe..66138fcdb 100644
--- a/redhat/applications/basket/basket-14.0.0.spec
+++ b/redhat/applications/basket/basket-14.0.0.spec
@@ -1,54 +1,85 @@
-# Default version for this component
-%define tde_pkg basket
+#
+# spec file for package basket (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 basket
+%define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
 %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_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:		Taking care of your ideas.
-Version:		1.0.3.1
-Release:		%{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant}
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	1.0.3.1
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	Taking care of your ideas
+Group:		Applications/Utilities
+URL:		http://www.trinitydesktop.org/
 
-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://www.trinitydesktop.org/
+#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
 
-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:	trinity-tdepim-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
 
+BuildRequires:	desktop-file-utils
 BuildRequires:	gpgme-devel
 
+BuildRequires:	autoconf automake libtool m4
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	libtool
+
+# 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
 This application is mainly an all-purpose notes taker. It provide several baskets where
 to drop every sort of items: text, rich text, links, images, sounds, files, colors,
@@ -58,23 +89,26 @@ images...) or notes, as well as to free your clutered desktop (if any). It is al
 to collect informations for a report. Those data can be shared with co-workers by exporting
 baskets to HTML.
 
+##########
 
-%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 -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"
 
 
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
+export kde_confdir="%{tde_confdir}"
 
 # Warning: --enable-final causes FTBFS
 %configure \
@@ -103,26 +137,17 @@ export PATH="%{tde_bindir}:${PATH}"
 
 %find_lang %{tde_pkg}
 
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file -G "Extended Clipboard" "%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop" DesktopUtility
+%endif
 
-%clean
-%__rm -rf %{buildroot}
-
+# Apps that should stay in TDE
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
 
-%post
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-/sbin/ldconfig
-update-desktop-database %{tde_tdeappdir} -q &> /dev/null
 
-%postun
-for f in crystalsvg ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-/sbin/ldconfig
-update-desktop-database %{tde_tdeappdir} -q &> /dev/null
+%clean
+%__rm -rf %{buildroot}
 
 
 %files -f %{tde_pkg}.lang
@@ -131,6 +156,7 @@ update-desktop-database %{tde_tdeappdir} -q &> /dev/null
 %{tde_bindir}/basket
 %{tde_tdeappdir}/basket.desktop
 %{tde_datadir}/apps/basket/
+%dir %{tde_datadir}/apps/kontact/ksettingsdialog
 %{tde_datadir}/apps/kontact/ksettingsdialog/kontact_basketplugin.setdlg
 %{tde_libdir}/libbasketcommon.la
 %{tde_libdir}/libbasketcommon.so
@@ -142,7 +168,7 @@ update-desktop-database %{tde_tdeappdir} -q &> /dev/null
 %{tde_tdelibdir}/libbasketpart.so
 %{tde_tdelibdir}/libkontact_basket.la
 %{tde_tdelibdir}/libkontact_basket.so
-%{tde_datadir}/config/magic/basket.magic
+%{tde_confdir}/magic/basket.magic
 %{tde_datadir}/icons/crystalsvg/*/*/*
 %{tde_datadir}/mimelnk/application/x-basket-archive.desktop
 %{tde_datadir}/mimelnk/application/x-basket-template.desktop
@@ -158,8 +184,7 @@ update-desktop-database %{tde_tdeappdir} -q &> /dev/null
 %{tde_datadir}/services/kontact/basket.desktop
 %{tde_datadir}/services/kontact/basket_v4.desktop
 %{tde_tdedocdir}/HTML/en/basket/
+%{tde_confdir}/magic/basket.magic.mgc
 
 
 %changelog
-* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.3.1-7
-- Initial release for TDE 14.0.0
diff --git a/redhat/applications/basket/basket-3.5.13.2.spec b/redhat/applications/basket/basket-3.5.13.2.spec
index a44ddd45f..c392dea83 100644
--- a/redhat/applications/basket/basket-3.5.13.2.spec
+++ b/redhat/applications/basket/basket-3.5.13.2.spec
@@ -2,11 +2,6 @@
 %define tde_pkg basket
 %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
@@ -26,7 +21,7 @@
 Name:			trinity-%{tde_pkg}
 Summary:		Taking care of your ideas.
 Version:		1.0.3.1
-Release:		%{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
+Release:		%{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}
 
 License:		GPLv2+
 Group:			Applications/Utilities
@@ -68,7 +63,7 @@ baskets to HTML.
 %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"
 
 
@@ -160,14 +155,3 @@ update-desktop-database %{tde_tdeappdir} -q &> /dev/null
 
 
 %changelog
-* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.3.1-6
-- Build for Fedora 19
-
-* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.3.1-5
-- Rebuild with NDEBUG option
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.3.1-4
-- Initial release for TDE 3.5.13.2
-
-* Tue Oct 02 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.3.1-3
-- Initial release for TDE 3.5.13.1