summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2013-11-16 12:54:01 +0100
committerFrançois Andriot <albator78@libertysurf.fr>2013-11-16 12:54:01 +0100
commitf0a3fcec33407b8f58343d0b63ce85c375e65917 (patch)
tree9584311affd495d76f5fbbd815de3cfea804b3e5
parente72b5e345ea0f786ec9e0bb358c68cc736cdeccf (diff)
downloadtde-packaging-f0a3fcec33407b8f58343d0b63ce85c375e65917.tar.gz
tde-packaging-f0a3fcec33407b8f58343d0b63ce85c375e65917.zip
RPM Packaging: update other packages
-rw-r--r--redhat/dependencies/tqt3/tqt3-14.0.0.spec87
-rw-r--r--redhat/tde-i18n/tde-i18n-14.0.0-fr-updates.patch40
2 files changed, 78 insertions, 49 deletions
diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
index 4abafed20..ce2890a07 100644
--- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec
+++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
@@ -305,24 +305,24 @@ toolkit.
%files devel
%defattr(-,root,root,-)
-%{tde_bindir}/conv2ui
-%{tde_bindir}/qvfb
+%{tde_bindir}/tqtconv2ui
+%{tde_bindir}/tqvfb
%{tde_bindir}/tqmoc
%{tde_bindir}/tquic
-%{tde_bindir}/findtr
-%{tde_bindir}/qt20fix
-%{tde_bindir}/qtrename140
+%{tde_bindir}/tqtfindtr
+%{tde_bindir}/tqt20fix
+%{tde_bindir}/tqtrename140
%{tde_bindir}/tqassistant
-%{tde_bindir}/qm2ts
+%{tde_bindir}/tqm2ts
%{tde_bindir}/tqmake
%{tde_bindir}/tqembed
%{tde_bindir}/tqlinguist
%{tde_bindir}/tqlupdate
%{tde_bindir}/tqlrelease
-%{tde_bindir}/createcw
-%{tde_bindir}/makeqpf
-%{tde_bindir}/mergetr
-%{tde_bindir}/msg2qm
+%{tde_bindir}/tqtcreatecw
+%{tde_bindir}/maketqpf
+%{tde_bindir}/tqtmergetr
+%{tde_bindir}/msg2tqm
%{tde_datadir}/tqt3/mkspecs/
%{tde_datadir}/tqt3/phrasebooks/
%{tde_includedir}/tqt3/
@@ -452,6 +452,12 @@ for the TQt 3 toolkit.
##########
+%if 0%{?suse_version} || 0%{?pclinuxos}
+%debug_package
+%endif
+
+##########
+
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
@@ -473,6 +479,7 @@ for the TQt 3 toolkit.
-e "s|^QMAKE_INCDIR_QT =.*|QMAKE_INCDIR_QT = %{_includedir}/tqt3|" \
-e "s|^QMAKE_LIBDIR_QT =.*|QMAKE_LIBDIR_QT = %{_libdir}|" \
+
%build
unset QTDIR QTINC QTLIB
export QTDIR=$(pwd)
@@ -513,31 +520,31 @@ echo yes | ./configure \
${INCDIRS} \
${LIBDIRS} \
-L%{_libdir} \
- -prefix "%{tde_prefix}" \
+ -prefix "%{tde_prefix}" \
-libdir "%{tde_libdir}" \
- -sysconfdir "%{_sysconfdir}/tqt3" \
- -datadir "%{tde_datadir}/tqt3" \
- -headerdir "%{tde_includedir}/tqt3" \
- -docdir "%{tde_datadir}/tqt3/doc" \
- -plugindir "%{tde_libdir}/tqt3/plugins" \
- -translationdir "%{tde_datadir}/tqt3/translations" \
- \
- -thread \
- -shared \
- -fast \
- -no-exceptions \
+ -sysconfdir "%{_sysconfdir}/tqt3" \
+ -datadir "%{tde_datadir}/tqt3" \
+ -headerdir "%{tde_includedir}/tqt3" \
+ -docdir "%{tde_datadir}/tqt3/doc" \
+ -plugindir "%{tde_libdir}/tqt3/plugins" \
+ -translationdir "%{tde_datadir}/tqt3/translations" \
+ \
+ -thread \
+ -shared \
+ -fast \
+ -no-exceptions \
%if "%{_lib}" == "lib64"
-platform linux-g++-64 \
%else
-platform linux-g++ \
%endif
- \
+ \
-nis \
-no-pch \
-cups \
-stl \
-ipv6 \
- \
+ \
-sm \
-xshape \
-xinerama \
@@ -547,27 +554,27 @@ echo yes | ./configure \
-xft \
-tablet \
-xkb \
- \
+ \
-system-zlib \
-system-libpng \
-system-libmng \
-system-libjpeg \
%{?with_nas:-system-nas-sound} %{?!with_nas:-no-nas-sound} \
- \
+ \
-enable-opengl \
-dlopen-opengl \
- \
+ \
-qt-gif \
-qt-imgfmt-png \
-qt-imgfmt-jpeg \
-plugin-imgfmt-mng \
- \
+ \
-plugin-sql-odbc \
-plugin-sql-psql \
-plugin-sql-mysql \
%{?with_ibase:-plugin-sql-ibase} \
-plugin-sql-sqlite \
- \
+ \
-lfontconfig \
-inputmethod \
%{?with_glibmainloop:-glibmainloop} \
@@ -577,11 +584,11 @@ echo yes | ./configure \
# proceed
%__make %{?_smp_mflags} sub-src sub-plugins sub-tools
-# build conv2ui
-%__make -C tools/designer/tools/conv2ui
+# build tqtconv2ui
+%__make -C tools/designer/tools/tqtconv2ui
-# build qvfb
-%__make -C tools/qvfb
+# build tqvfb
+%__make -C tools/tqvfb
# fix .prl files
%__sed -i lib/*.prl -e "s|${QTDIR}|%{tde_datadir}/tqt3|g"
@@ -599,15 +606,15 @@ export PATH=${QTDIR}/bin:$PATH
%__make INSTALL_ROOT=%{?buildroot} install
%__make INSTALL_ROOT=%{?buildroot} plugins-install
-%__install -m755 bin/qtrename140 %{?buildroot}%{_bindir}
-%__install -m755 bin/qt20fix %{?buildroot}%{_bindir}
-%__install -m755 bin/findtr %{?buildroot}%{_bindir}
+%__install -m755 bin/tqtrename140 %{?buildroot}%{_bindir}
+%__install -m755 bin/tqt20fix %{?buildroot}%{_bindir}
+%__install -m755 bin/tqtfindtr %{?buildroot}%{_bindir}
-# install conv2ui
-%__install -m755 bin/conv2ui %{?buildroot}%{_bindir}/conv2ui
+# install tqtconv2ui
+%__install -m755 bin/tqtconv2ui %{?buildroot}%{_bindir}/tqtconv2ui
-# install qvfb
-%__install -m755 tools/qvfb/qvfb %{?buildroot}%{_bindir}/qvfb
+# install tqvfb
+%__install -m755 tools/tqvfb/tqvfb %{?buildroot}%{_bindir}/tqvfb
%clean
diff --git a/redhat/tde-i18n/tde-i18n-14.0.0-fr-updates.patch b/redhat/tde-i18n/tde-i18n-14.0.0-fr-updates.patch
index 835aed72d..943a77eb0 100644
--- a/redhat/tde-i18n/tde-i18n-14.0.0-fr-updates.patch
+++ b/redhat/tde-i18n/tde-i18n-14.0.0-fr-updates.patch
@@ -11,9 +11,9 @@ diff -Nuar tde-i18n-fr.ORI/messages/tdebase/kcmbackground.po tde-i18n-fr/message
+
+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 tde-i18n-fr.ORI/messages/tdebase/tdecmdisplayconfig.po tde-i18n-fr/messages/tdebase/tdecmdisplayconfig.po
---- tde-i18n-fr.ORI/messages/tdebase/tdecmdisplayconfig.po 1970-01-01 01:00:00.000000000 +0100
-+++ tde-i18n-fr/messages/tdebase/tdecmdisplayconfig.po 2013-07-26 20:00:46.303178565 +0200
+diff -Nuar tde-i18n-fr.ORI/messages/tdebase/kcmdisplayconfig.po tde-i18n-fr/messages/tdebase/kcmdisplayconfig.po
+--- tde-i18n-fr.ORI/messages/tdebase/kcmdisplayconfig.po 1970-01-01 01:00:00.000000000 +0100
++++ tde-i18n-fr/messages/tdebase/kcmdisplayconfig.po 2013-07-26 20:00:46.303178565 +0200
@@ -0,0 +1,188 @@
+msgid "<b>The global display configuration is a system wide setting, and requires administrator access</b><br>To alter the system's global display configuration, click on the \"Administrator Mode\" button below."
+msgstr "<b>La configuration d'affichage globale est un réglage système, et nécessite les droits administrateur.</b><br>Pour modifier la configuration système globale, cliquer sur le bouton \"Mode superutilisateur\"."
@@ -217,9 +217,9 @@ diff -Nuar tde-i18n-fr.ORI/messages/tdebase/kcmenergy.po tde-i18n-fr/messages/td
+msgid "Configure KPowersave..."
+msgstr "Configurer KPowersave..."
+
-diff -Nuar tde-i18n-fr.ORI/messages/tdebase/tdecmiccconfig.po tde-i18n-fr/messages/tdebase/tdecmiccconfig.po
---- tde-i18n-fr.ORI/messages/tdebase/tdecmiccconfig.po 1970-01-01 01:00:00.000000000 +0100
-+++ tde-i18n-fr/messages/tdebase/tdecmiccconfig.po 2013-07-26 19:48:22.142618069 +0200
+diff -Nuar tde-i18n-fr.ORI/messages/tdebase/kcmiccconfig.po tde-i18n-fr/messages/tdebase/kcmiccconfig.po
+--- tde-i18n-fr.ORI/messages/tdebase/kcmiccconfig.po 1970-01-01 01:00:00.000000000 +0100
++++ tde-i18n-fr/messages/tdebase/kcmiccconfig.po 2013-07-26 19:48:22.142618069 +0200
@@ -0,0 +1,80 @@
+# TDE 3.5.13 'iccconfig.cpp' translation
+
@@ -918,7 +918,7 @@ diff -Nuar tde-i18n-fr.ORI/messages/tdebase/kdesktop.po tde-i18n-fr/messages/tde
#. i18n: file minicli_ui.ui line 199
#: rc.cpp:14
#, no-c-format
-@@ -1144,3 +1174,29 @@
+@@ -1144,3 +1174,39 @@
"Cependant, certains écrans de veille\n"
" effectuent des calculs utiles, dans ces cas, il est souhaitable de ne "
"pas les désactiver."
@@ -948,6 +948,16 @@ diff -Nuar tde-i18n-fr.ORI/messages/tdebase/kdesktop.po tde-i18n-fr/messages/tde
+
+msgid "'%1' is currently logged on"
+msgstr "'%1' est actuellement connecté"
++
++# SAK dialog (sakdlg.cpp)
++msgid "Press Ctrl+Alt+Del to begin."
++msgstr "Appuyez sur Ctrl+Alt+Suppr pour commencer."
++
++msgid "This process helps keep your password secure."
++msgstr "Ce processus permet de protéger votre mot de passe."
++
++msgid "It prevents unauthorized users from emulating the login screen."
++msgstr "Il empêche l'usurpation du panneau de connexion par d'autres processus."
diff -Nuar tde-i18n-fr.ORI/messages/tdebase/kicker.po tde-i18n-fr/messages/tdebase/kicker.po
--- tde-i18n-fr.ORI/messages/tdebase/kicker.po 2013-07-26 17:53:39.996658761 +0200
+++ tde-i18n-fr/messages/tdebase/kicker.po 2013-07-26 17:53:59.000152412 +0200
@@ -1489,7 +1499,7 @@ diff -Nuar tde-i18n-fr.ORI/messages/tdebase/kpersonalizer.po tde-i18n-fr/message
diff -Nuar tde-i18n-fr.ORI/messages/tdebase/ksmserver.po tde-i18n-fr/messages/tdebase/ksmserver.po
--- tde-i18n-fr.ORI/messages/tdebase/ksmserver.po 2013-07-26 17:53:39.995658788 +0200
+++ tde-i18n-fr/messages/tdebase/ksmserver.po 2013-07-29 11:12:48.861837356 +0200
-@@ -92,3 +92,82 @@
+@@ -92,3 +92,91 @@
"_: current option in boot loader\n"
" (current)"
msgstr " (courant)"
@@ -1572,6 +1582,15 @@ diff -Nuar tde-i18n-fr.ORI/messages/tdebase/ksmserver.po tde-i18n-fr/messages/td
+
+msgid "Terminating services..."
+msgstr "Arrêt des services..."
++
++msgid "&Freeze Computer"
++msgstr "Mettre en veille (&Freeze)"
++
++msgid "&Hibernate Computer"
++msgstr "Mettre en veille (sur &disque)"
++
++msgid "&Suspend Computer"
++msgstr "Mettre en veille (en R&AM)"
diff -Nuar tde-i18n-fr.ORI/messages/tdebase/ksplash.po tde-i18n-fr/messages/tdebase/ksplash.po
--- tde-i18n-fr.ORI/messages/tdebase/ksplash.po 2013-07-26 17:53:39.998658707 +0200
+++ tde-i18n-fr/messages/tdebase/ksplash.po 2013-07-26 17:53:51.201360190 +0200
@@ -1620,7 +1639,10 @@ diff -Nuar tde-i18n-fr.ORI/messages/tdebase/tderandr.po tde-i18n-fr/messages/tde
+
+#: tderandrtray.cpp:477
+msgid "Configure Display Color Profiles"
-+msgstr "Configuration des profils de couleurs"
++msgstr "Configurer les profils de couleurs"
++
++msgid "Configure Displays..."
++msgstr "Configurer l'affichage"
+
+#: tderandrbindings.cpp:29
+msgid "Display Control"