Branch: master

a20a9518 2014-06-08 12:21:13 François Andriot
RPM Packaging: update R14 packages
A redhat/tde-i18n/tde-i18n-14.0.0-extra_translations.patch
A redhat/tdebase/trinity-kdebase-3.5.13.3.spec
A redhat/tdebase/trinity-tdebase-3.5.13.3.spec
A redhat/tdelibs/trinity-tdelibs-3.5.13.3.spec
M redhat/applications/kmymoney/kmymoney-14.0.0.spec
M redhat/applications/koffice/koffice-14.0.0.spec
M redhat/applications/tdepowersave/tdepowersave-14.0.0.spec
M redhat/applications/tdmtheme/kdmtheme-3.5.13.1.spec
M redhat/applications/tdmtheme/kdmtheme-3.5.13.spec
M redhat/applications/tdmtheme/tdmtheme-14.0.0.spec
M redhat/applications/tdmtheme/tdmtheme-3.5.13.2.spec
M redhat/dependencies/sip4-tqt/sip4-tqt.spec
M redhat/tde-i18n/tde-i18n-14.0.0.spec
M redhat/tdeadmin/kdeadmin-3.5.13.1.spec
M redhat/tdeadmin/kdeadmin-3.5.13.spec
M redhat/tdeadmin/tdeadmin-14.0.0.spec
M redhat/tdeadmin/tdeadmin-3.5.13.2.spec
M redhat/tdeartwork/kdeartwork-3.5.13.1.spec
M redhat/tdeartwork/kdeartwork-3.5.13.spec
M redhat/tdeartwork/tdeartwork-14.0.0.spec
M redhat/tdeartwork/tdeartwork-3.5.13.2.spec
M redhat/tdebase/kdebase-3.5.13.1.spec
M redhat/tdebase/kdebase-3.5.13.spec
M redhat/tdebase/tdebase-14.0.0-tdehardwarebackend_fix_iocharset.patch
M redhat/tdebase/tdebase-14.0.0.spec
M redhat/tdebase/tdebase-3.5.13.2.spec
M redhat/tdenetwork/kdenetwork-3.5.13.1.spec
M redhat/tdenetwork/kdenetwork-3.5.13.spec
M redhat/tdenetwork/tdenetwork-14.0.0.spec
M redhat/tdenetwork/tdenetwork-3.5.13.2.spec
M redhat/tdevelop/tdevelop-14.0.0.spec
R redhat/tde-i18n/tde-i18n-14.0.0-fr-updates.patch
R redhat/tdebase/tdebase-14.0.0-displayconfig_translation.patch
diff --git a/redhat/applications/kmymoney/kmymoney-14.0.0.spec b/redhat/applications/kmymoney/kmymoney-14.0.0.spec
index 75a5d9c..af16661 100644
--- a/redhat/applications/kmymoney/kmymoney-14.0.0.spec
+++ b/redhat/applications/kmymoney/kmymoney-14.0.0.spec
@@ -45,7 +45,6 @@
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 Source1:		kmymoneytitlelabel.png
-Patch0:			kmymoney-sqlite3-detection.diff
 
 BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
 BuildRequires:	trinity-arts-devel >= 1:1.5.10
@@ -91,7 +90,7 @@
 %package common
 Summary:		KMyMoney architecture independent files
 Group:			Applications/Utilities
-Requires:		%{name} == %{version}
+Requires:		%{name} == %{version}-%{release}
 
 %description common
 This package contains architecture independent files needed for KMyMoney to
@@ -102,7 +101,7 @@
 %package devel
 Summary:		KMyMoney development files
 Group:			Development/Libraries
-Requires:		%{name} == %{version}
+Requires:		%{name} == %{version}-%{release}
 
 %description devel
 This package contains development files needed for KMyMoney plugins.
@@ -115,7 +114,6 @@
 
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%patch0 -p1 -b .sqlite3
 
 %__install -m644 %{SOURCE1} kmymoney2/widgets/
 
diff --git a/redhat/applications/koffice/koffice-14.0.0.spec b/redhat/applications/koffice/koffice-14.0.0.spec
index c1ce15c..6803cf6 100644
--- a/redhat/applications/koffice/koffice-14.0.0.spec
+++ b/redhat/applications/koffice/koffice-14.0.0.spec
@@ -55,8 +55,6 @@
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-#Patch0:			koffice-14.0.0-ftbfs.patch
-
 # BuildRequires: world-devel ;)
 BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
 BuildRequires:	trinity-arts-devel >= 1:1.5.10
@@ -1063,7 +1061,6 @@
 
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-#patch0 -p1 -b .ftbfs
 
 %__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"
diff --git a/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec b/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec
index 288aed6..268c2d3 100644
--- a/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec
+++ b/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec
@@ -41,8 +41,6 @@
 
 Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-Patch1:		1391880088:c68a1bac04c5cfdb0cdcbd91dc54995bfa05e292.diff
-
 BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
 BuildRequires:	trinity-arts-devel >= 1:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
@@ -89,7 +87,6 @@
 
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%patch1 -R -p1
 
 
 %build
diff --git a/redhat/applications/tdmtheme/kdmtheme-3.5.13.1.spec b/redhat/applications/tdmtheme/kdmtheme-3.5.13.1.spec
index 4c0d455..ff99cfc 100644
--- a/redhat/applications/tdmtheme/kdmtheme-3.5.13.1.spec
+++ b/redhat/applications/tdmtheme/kdmtheme-3.5.13.1.spec
@@ -48,7 +48,7 @@
 
 
 %description
-kdmtheme is a theme manager for KDM. It provides a TDE Control Module (KCM)
+kdmtheme is a theme manager for KDM. It provides a Trinity Control Module (KCM)
 that allows you to easily install, remove and change your KDM themes.
 
 
diff --git a/redhat/applications/tdmtheme/kdmtheme-3.5.13.spec b/redhat/applications/tdmtheme/kdmtheme-3.5.13.spec
index 63f849d..22f3cd3 100644
--- a/redhat/applications/tdmtheme/kdmtheme-3.5.13.spec
+++ b/redhat/applications/tdmtheme/kdmtheme-3.5.13.spec
@@ -48,7 +48,7 @@
 
 
 %description
-kdmtheme is a theme manager for KDM. It provides a TDE Control Module (KCM)
+kdmtheme is a theme manager for KDM. It provides a Trinity Control Module (KCM)
 that allows you to easily install, remove and change your KDM themes.
 
 
diff --git a/redhat/applications/tdmtheme/tdmtheme-14.0.0.spec b/redhat/applications/tdmtheme/tdmtheme-14.0.0.spec
index 371e187..88bb457 100644
--- a/redhat/applications/tdmtheme/tdmtheme-14.0.0.spec
+++ b/redhat/applications/tdmtheme/tdmtheme-14.0.0.spec
@@ -54,7 +54,7 @@
 
 
 %description
-kdmtheme is a theme manager for KDM. It provides a TDE Control Module (KCM)
+kdmtheme is a theme manager for KDM. It provides a Trinity Control Module (KCM)
 that allows you to easily install, remove and change your KDM themes.
 
 
diff --git a/redhat/applications/tdmtheme/tdmtheme-3.5.13.2.spec b/redhat/applications/tdmtheme/tdmtheme-3.5.13.2.spec
index 8df2bce..23c6090 100644
--- a/redhat/applications/tdmtheme/tdmtheme-3.5.13.2.spec
+++ b/redhat/applications/tdmtheme/tdmtheme-3.5.13.2.spec
@@ -54,7 +54,7 @@
 
 
 %description
-kdmtheme is a theme manager for KDM. It provides a TDE Control Module (KCM)
+kdmtheme is a theme manager for KDM. It provides a Trinity Control Module (KCM)
 that allows you to easily install, remove and change your KDM themes.
 
 
diff --git a/redhat/dependencies/sip4-tqt/sip4-tqt.spec b/redhat/dependencies/sip4-tqt/sip4-tqt.spec
index 8d3a7e8..f87bedf 100644
--- a/redhat/dependencies/sip4-tqt/sip4-tqt.spec
+++ b/redhat/dependencies/sip4-tqt/sip4-tqt.spec
@@ -39,12 +39,6 @@
 borrowed from SWIG, but capable of tighter bindings because of its
 specificity towards C++ and Python.
 
-%post
-/sbin/ldconfig || :
-
-%postun
-/sbin/ldconfig || :
-
 %files
 %defattr(-,root,root,-)
 %dir %{python_sitearch}/sip4_tqt
@@ -70,8 +64,8 @@
 class libraries.
 
 Features:
-- connecting Qt signals to Python functions and class methods
-- connecting Python signals to Qt slots
+- connecting TQt signals to Python functions and class methods
+- connecting Python signals to TQt slots
 - overloading virtual member functions with Python class methods
 - protected member functions
 - abstract classes
@@ -81,12 +75,6 @@
 
 This package contains the code generator tool and the development headers
 needed to develop Python bindings with sip.
-
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
 
 %files devel
 %defattr(-,root,root,-)
diff --git a/redhat/tde-i18n/tde-i18n-14.0.0-extra_translations.patch b/redhat/tde-i18n/tde-i18n-14.0.0-extra_translations.patch
new file mode 100644
index 0000000..07691ab
--- /dev/null
+++ b/redhat/tde-i18n/tde-i18n-14.0.0-extra_translations.patch
@@ -0,0 +1,123 @@
+diff -Nuar fr.p2/messages/tdebase/kcmbackground.po fr.p3/messages/tdebase/kcmbackground.po
+--- fr.p2/messages/tdebase/kcmbackground.po	2014-06-07 15:36:34.455347661 +0200
++++ fr.p3/messages/tdebase/kcmbackground.po	2014-06-07 16:44:15.728310955 +0200
+@@ -920,3 +920,9 @@
+ #, no-c-format
+ msgid "Move &Up"
+ msgstr "Mon&ter"
++
++msgid "Cross-fading background"
++msgstr "Affichage progressif du fond d'��cran"
++
++msgid "Enables a smooth fading effect when changing background image."
++msgstr "Activer un effet de fondu lors du changement de fond d'��cran."
+diff -Nuar fr.p2/messages/tdebase/kcmenergy.po fr.p3/messages/tdebase/kcmenergy.po
+--- fr.p2/messages/tdebase/kcmenergy.po	2014-06-07 15:36:34.455347661 +0200
++++ fr.p3/messages/tdebase/kcmenergy.po	2014-06-07 16:44:21.892169693 +0200
+@@ -102,3 +102,10 @@
+ "Choisissez la p��riode d'inactivit�� apr��s laquelle l'affichage doit ��tre ��teint. "
+ "Ceci est le plus haut niveau d'��conomie d'��nergie qui puisse ��tre utilis�� "
+ "lorsque l'��cran est physiquement allum��."
++
++msgid "&Enable specific display power management"
++msgstr "&Activer la gestion sp��cifique de l'��nergie"
++
++msgid "Configure KPowersave..."
++msgstr "Configurer KPowersave..."
++
+diff -Nuar fr.p2/messages/tdebase/kcmkonq.po fr.p3/messages/tdebase/kcmkonq.po
+--- fr.p2/messages/tdebase/kcmkonq.po	2014-06-07 15:52:30.603936867 +0200
++++ fr.p3/messages/tdebase/kcmkonq.po	2014-06-07 16:44:27.234047255 +0200
+@@ -877,3 +877,43 @@
+ #: rootopts.cpp:276
+ msgid "Confirmation Required"
+ msgstr "Confirmation requise"
++
++# TDE
++msgid "Download path:"
++msgstr "Dossier des t��l��chargements :"
++
++msgid "This folder will be used by default to load or save downloads from or to."
++msgstr "Ce dossier sera utilis�� par d��faut pour t��l��charger des fichiers."
++
++msgid "Music path:"
++msgstr "Dossier des musiques :"
++
++msgid "This folder will be used by default to load or save music from or to."
++msgstr "Ce dossier sera utilis�� par d��faut pour lire ou enregistrer de la musique."
++
++msgid "Pictures path:"
++msgstr "Dossier des images :"
++
++msgid "This folder will be used by default to load or save pictures from or to."
++msgstr "Ce dossier sera utilis�� par d��faut pour lire en enregistrer des images."
++
++msgid "Public Share path:"
++msgstr "Dossier des partages publics :"
++
++msgid "This folder will be used by default to load or save public shared files from or to."
++msgstr "Ce dossier sera utilis�� par d��faut pour ouvrir ou enregistrer les fichiers partag��s publiquement."
++
++msgid "Templates path:"
++msgstr "Dossier des mod��les :"
++
++msgid "This folder will be used by default to load or save templates from or to."
++msgstr "Ce dossier sera utilis�� par d��faut pour ouvrir ou enregistrer des mod��les."
++
++msgid "Videos path:"
++msgstr "Dossier des vid��os :"
++
++msgid "This folder will be used by default to load or save videos from or to."
++msgstr "Ce dossier sera utilis�� par d��faut pour lire en ouregistrer des vid��os."
 ** Diff limit reached (max: 250 lines) **