RPM packaging: update basket

5 files changed, 42 insertions, 485 deletions

diff --git a/redhat/applications/basket/basket-14.0.0.spec b/redhat/applications/basket/basket-14.0.0.spec
index 83e6196fe..365c1b4b0 100644
--- a/redhat/applications/basket/basket-14.0.0.spec
+++ b/redhat/applications/basket/basket-14.0.0.spec
@@ -1,52 +1,64 @@
-# Default version for this component
-%define tde_pkg basket
+#
+# spec file for package basket (version R14.0.0)
+#
+# 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
 %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_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:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Group:		Applications/Utilities
+Summary:	Taking care of your ideas.
+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
 
 %description
@@ -58,11 +70,13 @@ 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}}
@@ -161,5 +175,5 @@ update-desktop-database %{tde_tdeappdir} -q &> /dev/null
 
 
 %changelog
-* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 1.0.3.1-7
+* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 2:1.0.3.1-1
 - Initial release for TDE 14.0.0
diff --git a/redhat/applications/basket/basket-3.5.12.spec b/redhat/applications/basket/basket-3.5.12.spec
deleted file mode 100644
index fbd83bef0..000000000
--- a/redhat/applications/basket/basket-3.5.12.spec
+++ /dev/null
@@ -1,118 +0,0 @@
-# Default version for this component
-%define kdecomp basket
-%define version 1.0.3.1
-%define release 3
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
-%define _variant .opt
-%define _docdir %{_prefix}/share/doc
-%endif
-
-# TDE 3.5.12 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/kde3
-
-
-Name:		trinity-%{kdecomp}
-Summary:	Taking care of your ideas.
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Source0:	%{kdecomp}-3.5.12.tar.gz
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-kdelibs-devel
-BuildRequires: trinity-kdebase-devel
-BuildRequires: desktop-file-utils
-
-%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,
-application launcher... Objects can be edited, copied, dragged... So, you can arrange
-them as you want ! This application can be used to quickly drop web objects (link, text,
-images...) or notes, as well as to free your clutered desktop (if any). It is also useful
-to collect informations for a report. Those data can be shared with co-workers by exporting
-baskets to HTML.
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
-
-%configure \
-	--disable-rpath \
-    --with-extra-includes=%{_includedir}/tqt
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%make_install
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%post
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-
-%postun
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{_bindir}/*
-%{_datadir}/applications/*/*.desktop
-%{_datadir}/apps/*/
-%{_datadir}/icons/*/*/*/*
-%{_datadir}/locale/*/*/*.mo
-%{tde_docdir}/HTML/en/*/
-%{_datadir}/services/*.desktop
-%{_datadir}/mimelnk/application/*.desktop
-%{_datadir}/services/*/*.desktop
-%{_datadir}/config/magic/*.magic
-%{_libdir}/*.so
-%{tde_libdir}/*.so
-
-%exclude %{_libdir}/*.la
-%exclude %{tde_libdir}/*.la
-
-
-%Changelog
-* Tue Sep 14 2011 Francois Andriot <francois.andriot@free.fr> - 1.0.3.1-3
-- Import to GIT
-
-* Tue Aug 23 2011 Francois Andriot <francois.andriot@free.fr> - 1.0.3.1-2
-- Add correction for Fedora 15
-
-* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 1.0.3.1-1
-- Correct macro to install under "/opt", if desired
-
-* Sun Aug 14 2011 Francois Andriot <francois.andriot@free.fr> - 1.0.3.1-0
-- Initial release for RHEL 6.0
-
diff --git a/redhat/applications/basket/basket-3.5.13-fix_gcc47_compilation.patch b/redhat/applications/basket/basket-3.5.13-fix_gcc47_compilation.patch
deleted file mode 100644
index f9706285f..000000000
--- a/redhat/applications/basket/basket-3.5.13-fix_gcc47_compilation.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- basket/src/likeback.cpp.ORI	2012-05-01 13:57:36.852590875 +0200
-+++ basket/src/likeback.cpp	2012-05-01 13:57:51.403632210 +0200
-@@ -50,6 +50,7 @@
- #include <pwd.h>
- 
- #include <iostream>
-+#include <unistd.h>
- 
- #include "likeback.h"
- #include "likeback_private.h"
diff --git a/redhat/applications/basket/basket-3.5.13.1.spec b/redhat/applications/basket/basket-3.5.13.1.spec
deleted file mode 100644
index e490398ca..000000000
--- a/redhat/applications/basket/basket-3.5.13.1.spec
+++ /dev/null
@@ -1,165 +0,0 @@
-# Default version for this component
-%define kdecomp basket
-
-# 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 3.5.13 specific building variables
-%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_tdeappdir %{tde_datadir}/applications/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	Taking care of your ideas.
-Version:	1.0.3.1
-Release:	3%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
-
-# [basket] Fix compilation with GCC 4.7
-Patch1:	basket-3.5.13-fix_gcc47_compilation.patch
-
-BuildRequires: trinity-tqtinterface-devel >= 3.5.13.1
-BuildRequires: trinity-tdelibs-devel >= 3.5.13.1
-BuildRequires: trinity-tdebase-devel >= 3.5.13.1
-BuildRequires: trinity-tdepim-devel >= 3.5.13.1
-BuildRequires: desktop-file-utils
-
-BuildRequires: gpgme-devel
-
-%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,
-application launcher... Objects can be edited, copied, dragged... So, you can arrange
-them as you want ! This application can be used to quickly drop web objects (link, text,
-images...) or notes, as well as to free your clutered desktop (if any). It is also useful
-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}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{kdecomp}-3.5.13.1
-%patch1 -p1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__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"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-	--prefix=%{tde_prefix} \
-	--exec-prefix=%{tde_prefix} \
-	--bindir=%{tde_bindir} \
-	--includedir=%{tde_tdeincludedir} \
-	--libdir=%{tde_libdir} \
-	--datadir=%{tde_datadir} \
-	--disable-rpath \
-    --with-extra-includes=%{tde_includedir}/tqt \
-    --disable-static
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{kdecomp}
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%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
-
-%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
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/basket
-%{tde_tdeappdir}/basket.desktop
-%{tde_datadir}/apps/basket/
-%{tde_datadir}/apps/kontact/ksettingsdialog/kontact_basketplugin.setdlg
-%{tde_libdir}/libbasketcommon.la
-%{tde_libdir}/libbasketcommon.so
-%{tde_tdelibdir}/basketthumbcreator.la
-%{tde_tdelibdir}/basketthumbcreator.so
-%{tde_tdelibdir}/kcm_basket.la
-%{tde_tdelibdir}/kcm_basket.so
-%{tde_tdelibdir}/libbasketpart.la
-%{tde_tdelibdir}/libbasketpart.so
-%{tde_tdelibdir}/libkontact_basket.la
-%{tde_tdelibdir}/libkontact_basket.so
-%{tde_datadir}/config/magic/basket.magic
-%{tde_datadir}/icons/crystalsvg/*/*/*
-%{tde_datadir}/mimelnk/application/x-basket-archive.desktop
-%{tde_datadir}/mimelnk/application/x-basket-template.desktop
-%{tde_datadir}/services/basket_config_apps.desktop
-%{tde_datadir}/services/basket_config_baskets.desktop
-%{tde_datadir}/services/basket_config_features.desktop
-%{tde_datadir}/services/basket_config_general.desktop
-%{tde_datadir}/services/basket_config_new_notes.desktop
-%{tde_datadir}/services/basket_config_notes.desktop
-%{tde_datadir}/services/basket_config_notes_appearance.desktop
-%{tde_datadir}/services/basket_part.desktop
-%{tde_datadir}/services/basketthumbcreator.desktop
-%{tde_datadir}/services/kontact/basket.desktop
-%{tde_datadir}/services/kontact/basket_v4.desktop
-%{tde_tdedocdir}/HTML/en/basket/
-
-
-%Changelog
-* Tue Oct 02 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.3.1-3
-- Initial release for TDE 3.5.13.1
diff --git a/redhat/applications/basket/basket-3.5.13.spec b/redhat/applications/basket/basket-3.5.13.spec
deleted file mode 100644
index b9d845859..000000000
--- a/redhat/applications/basket/basket-3.5.13.spec
+++ /dev/null
@@ -1,164 +0,0 @@
-# Default version for this component
-%define kdecomp basket
-
-# 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 3.5.13 specific building variables
-%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_tdeappdir %{tde_datadir}/applications/kde
-%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_tdeincludedir %{tde_includedir}/kde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:		trinity-%{kdecomp}
-Summary:	Taking care of your ideas.
-Version:	1.0.3.1
-Release:	2%{?dist}%{?_variant}
-
-License:	GPLv2+
-Group:		Applications/Utilities
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-URL:		http://www.trinitydesktop.org/
-
-Prefix:    %{_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{kdecomp}-3.5.13.tar.gz
-
-# [basket] Fix compilation with GCC 4.7
-Patch1:	basket-3.5.13-fix_gcc47_compilation.patch
-
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-kdelibs-devel
-BuildRequires: trinity-kdebase-devel
-BuildRequires: desktop-file-utils
-
-BuildRequires: gpgme-devel
-BuildRequires: trinity-tdepim-devel >= 3.5.13
-
-%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,
-application launcher... Objects can be edited, copied, dragged... So, you can arrange
-them as you want ! This application can be used to quickly drop web objects (link, text,
-images...) or notes, as well as to free your clutered desktop (if any). It is also useful
-to collect informations for a report. Those data can be shared with co-workers by exporting
-baskets to HTML.
-
-
-%prep
-%setup -q -n applications/%{kdecomp}
-%patch1 -p1
-
-# Ugly hack to modify TQT include directory inside autoconf files.
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
-
-%__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"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
-
-%configure \
-	--prefix=%{tde_prefix} \
-	--exec-prefix=%{tde_prefix} \
-	--bindir=%{tde_bindir} \
-	--libdir=%{tde_libdir} \
-	--datadir=%{tde_datadir} \
-	--disable-rpath \
-    --with-extra-includes=%{_includedir}/tqt \
-    --disable-static
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{kdecomp}
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%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
-
-%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
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING
-%{tde_bindir}/basket
-%{tde_tdeappdir}/basket.desktop
-%{tde_datadir}/apps/basket/
-%{tde_datadir}/apps/kontact/ksettingsdialog/kontact_basketplugin.setdlg
-%{tde_libdir}/libbasketcommon.la
-%{tde_libdir}/libbasketcommon.so
-%{tde_tdelibdir}/basketthumbcreator.la
-%{tde_tdelibdir}/basketthumbcreator.so
-%{tde_tdelibdir}/kcm_basket.la
-%{tde_tdelibdir}/kcm_basket.so
-%{tde_tdelibdir}/libbasketpart.la
-%{tde_tdelibdir}/libbasketpart.so
-%{tde_tdelibdir}/libkontact_basket.la
-%{tde_tdelibdir}/libkontact_basket.so
-%{tde_datadir}/config/magic/basket.magic
-%{tde_datadir}/icons/crystalsvg/*/*/*
-%{tde_datadir}/mimelnk/application/x-basket-archive.desktop
-%{tde_datadir}/mimelnk/application/x-basket-template.desktop
-%{tde_datadir}/services/basket_config_apps.desktop
-%{tde_datadir}/services/basket_config_baskets.desktop
-%{tde_datadir}/services/basket_config_features.desktop
-%{tde_datadir}/services/basket_config_general.desktop
-%{tde_datadir}/services/basket_config_new_notes.desktop
-%{tde_datadir}/services/basket_config_notes.desktop
-%{tde_datadir}/services/basket_config_notes_appearance.desktop
-%{tde_datadir}/services/basket_part.desktop
-%{tde_datadir}/services/basketthumbcreator.desktop
-%{tde_datadir}/services/kontact/basket.desktop
-%{tde_datadir}/services/kontact/basket_v4.desktop
-%{tde_tdedocdir}/HTML/en/basket/
-
-
-%Changelog
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.3.1-2
-- Fix build, post and postun
-- Fix compilation with GCC 4.7
-
-* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 1.0.3.1-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16
-