RPM Packaging: updates for 14.0.0

pull/3/head
François Andriot 11 years ago
parent 22bcb2f1bd
commit 9d7027521c

@ -275,7 +275,7 @@ fi
%{tde_tdelibdir}/koshell.* %{tde_tdelibdir}/koshell.*
%{tde_tdelibdir}/kthesaurus.* %{tde_tdelibdir}/kthesaurus.*
%{tde_tdelibdir}/kwmailmerge_classic.* %{tde_tdelibdir}/kwmailmerge_classic.*
%{tde_tdelibdir}/kwmailmerge_kabc.* %{tde_tdelibdir}/kwmailmerge_tdeabc.*
%{tde_tdelibdir}/kwmailmerge_qtsqldb_power.* %{tde_tdelibdir}/kwmailmerge_qtsqldb_power.*
%{tde_tdelibdir}/kwmailmerge_qtsqldb.* %{tde_tdelibdir}/kwmailmerge_qtsqldb.*
%{tde_tdelibdir}/libkounavailpart.* %{tde_tdelibdir}/libkounavailpart.*

@ -100,14 +100,14 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} %__make install DESTDIR=%{buildroot}
%find_lang kio-apt %find_lang %{tde_pkg}
%clean %clean
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%files -f kio-apt.lang %files -f %{tde_pkg}.lang
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc AUTHORS CHANGELOG ChangeLog COPYING %doc AUTHORS CHANGELOG ChangeLog COPYING
%{tde_tdelibdir}/tdeio_apt.la %{tde_tdelibdir}/tdeio_apt.la

@ -25,7 +25,7 @@
Name: trinity-%{tde_pkg} Name: trinity-%{tde_pkg}
Summary: kio-slave for the locate command [Trinity] Summary: tdeio-slave for the locate command [Trinity]
Version: 0.4.5 Version: 0.4.5
Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
@ -107,19 +107,19 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} -C build %__make install DESTDIR=%{buildroot} -C build
%find_lang kio-locate %find_lang %{tde_pkg}
%clean %clean
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%files -f kio-locate.lang %files -f %{tde_pkg}.lang
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING TODO %doc AUTHORS ChangeLog COPYING TODO
%{tde_tdelibdir}/tdeio_locate.la %{tde_tdelibdir}/tdeio_locate.la
%{tde_tdelibdir}/tdeio_locate.so %{tde_tdelibdir}/tdeio_locate.so
%{tde_tdedocdir}/HTML/en/kio-locate/ %{tde_tdedocdir}/HTML/en/tdeio-locate/
%{tde_datadir}/services/locate.protocol %{tde_datadir}/services/locate.protocol
%{tde_datadir}/services/locater.protocol %{tde_datadir}/services/locater.protocol
%{tde_datadir}/services/rlocate.protocol %{tde_datadir}/services/rlocate.protocol

@ -51,18 +51,27 @@ BuildRequires: gettext
Obsoletes: trinity-knetworkmanager < %{version}-%{release} Obsoletes: trinity-knetworkmanager < %{version}-%{release}
Provides: trinity-knetworkmanager = %{version}-%{release} Provides: trinity-knetworkmanager = %{version}-%{release}
# NETWORKMANAGER support
%if 0%{?rhel} || 0%{?fedora} %if 0%{?rhel} || 0%{?fedora}
Requires: NetworkManager-gnome Requires: NetworkManager-gnome
%else %endif
%if 0%{?mdkversion} || 0%{?mgaversion}
Requires: networkmanager Requires: networkmanager
%endif %endif
%if 0%{?rhel} || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
BuildRequires: NetworkManager-glib-devel
%endif
%if 0%{?suse_version}
BuildRequires: NetworkManager-devel
Requires: NetworkManager
%endif
# DBUS support
BuildRequires: trinity-dbus-1-tqt-devel >= 1:0.9 BuildRequires: trinity-dbus-1-tqt-devel >= 1:0.9
BuildRequires: trinity-dbus-tqt-devel >= 1:0.63 BuildRequires: trinity-dbus-tqt-devel >= 1:0.63
BuildRequires: NetworkManager-glib-devel
%description %description
KNetworkManager is a system tray applet for controlling network TDENetworkManager is a system tray applet for controlling network
connections on systems that use the NetworkManager daemon. connections on systems that use the NetworkManager daemon.
@ -72,7 +81,7 @@ Group: Development/Libraries
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
%description devel %description devel
Development headers for knetworkmanager Development headers for tdenetworkmanager
%if 0%{?suse_version} || 0%{?pclinuxos} %if 0%{?suse_version} || 0%{?pclinuxos}
@ -88,10 +97,8 @@ Development headers for knetworkmanager
unset QTDIR QTINC QTLIB unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
export CMAKE_INCLUDE_PATH="%{tde_includedir}"
export LD_LIBRARY_PATH="%{tde_libdir}"
%if 0%{?rhel} || 0%{?fedora} %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
%__mkdir_p build %__mkdir_p build
cd build cd build
%endif %endif
@ -166,6 +173,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%{tde_tdelibdir}/*.la %{tde_tdelibdir}/*.la
%{tde_tdelibdir}/*.so %{tde_tdelibdir}/*.so
%changelog %changelog
* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.9-1 * Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.9-1
- Initial release for TDE 14.0.0 - Initial release for TDE 14.0.0

@ -0,0 +1,32 @@
--- trinity-tdepowersave-14.0.0~pre158+340d2058/po/CMakeLists.txt 2013-08-19 06:54:55.000000000 +0200
+++ trinity-tdepowersave-14.0.0~pre158+340d2058/po/CMakeLists.txt.new 2013-08-19 19:25:41.566465666 +0200
@@ -9,9 +9,4 @@
#
#################################################
-# file( GLOB_RECURSE po_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} tdepowersave.po )
-
-foreach( _po ${po_files} )
- get_filename_component( _lang ${_po} PATH )
- tde_create_translation( FILES ${_po} LANG ${_lang} )
-endforeach( )
+tde_create_translation( LANG auto OUTPUT_NAME tdepowersave )
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index c257983..68fca16 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -57,6 +57,14 @@ if( NOT DBUS_TQT_FOUND )
tde_message_fatal( "dbus-tqt is required, but was not found on your system" )
endif( )
+# check for msgfmt
+if( NOT DEFINED MSGFMT_EXECUTABLE )
+ find_program( MSGFMT_EXECUTABLE msgfmt )
+ if( NOT MSGFMT_EXECUTABLE )
+ tde_message_fatal( "msgfmt program is required, but was not found on your system" )
+ endif( )
+endif( )
+
# required stuff
find_package( TQt )

@ -0,0 +1,98 @@
diff --git a/modules/TDEMacros.cmake b/modules/TDEMacros.cmake
index f290e2b..282b765 100644
--- a/cmake/modules/TDEMacros.cmake
+++ b/cmake/modules/TDEMacros.cmake
@@ -1049,6 +1049,7 @@ macro( tde_create_translation )
unset( _srcs )
unset( _lang )
unset( _dest )
+ unset( _out_name )
unset( _directive )
unset( _var )
@@ -1075,6 +1076,13 @@ macro( tde_create_translation )
set( _directive 1 )
endif( )
+ # found directive "DESTINATION"
+ if( "${_arg}" STREQUAL "OUTPUT_NAME" )
+ unset( _proj )
+ set( _var _out_name )
+ set( _directive 1 )
+ endif( )
+
# collect data
if( _directive )
unset( _directive )
@@ -1088,30 +1096,60 @@ macro( tde_create_translation )
tde_message_fatal( "MSGFMT_EXECUTABLE variable is not defined" )
elseif( NOT _lang )
tde_message_fatal( "missing LANG directive" )
- elseif( NOT _dest )
- set( _dest "${LOCALE_INSTALL_DIR}/${_lang}/LC_MESSAGES" )
endif( )
# if no file specified, include all *.po files
if( NOT _srcs )
file( GLOB _srcs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.po )
- endif()
+ endif( )
if( NOT _srcs )
tde_message_fatal( "no source files" )
- endif()
+ endif( )
+
+ if( NOT _lang STREQUAL "auto")
+ set( _real_lang ${_lang} )
+
+ if( NOT _dest )
+ set( _dest "${LOCALE_INSTALL_DIR}/${_lang}/LC_MESSAGES" )
+ endif( )
+
+ # OUTPUT_NAME can only be used if we have only one file
+ list( LENGTH _srcs _srcs_num)
+ if( _out_name AND _srcs_num GREATER 1 )
+ tde_message_fatal( "OUTPUT_NAME can be supplied only with single file or LANG=auto" )
+ endif( )
+
+ elseif( NOT _out_name )
+ tde_message_fatal( "LANG=auto reqires OUTPUT_NAME directive to be set" )
+ elseif( _dest )
+ tde_message_fatal( "DESTINATION cannot be used with LANG=auto" )
+ endif( )
# generate *.mo files
foreach( _src ${_srcs} )
+
get_filename_component( _src ${_src} ABSOLUTE )
- get_filename_component( _out ${_src} NAME_WE )
- set( _out_name "${_out}-${_lang}.mo" )
- set( _out_real_name "${_out}.mo" )
+
+ if( _out_name )
+ set( _out ${_out_name} )
+ if( _lang STREQUAL "auto" )
+ get_filename_component( _real_lang ${_src} NAME_WE )
+ set( _dest "${LOCALE_INSTALL_DIR}/${_real_lang}/LC_MESSAGES" )
+ endif( )
+ else( )
+ get_filename_component( _out ${_src} NAME_WE )
+ endif( )
+
+ set( _out_filename "${_out}-${_real_lang}.mo" )
+ set( _install_filename "${_out}.mo" )
+
add_custom_command(
- OUTPUT ${_out_name}
- COMMAND ${MSGFMT_EXECUTABLE} ${_src} -o ${_out_name}
+ OUTPUT ${_out_filename}
+ COMMAND ${MSGFMT_EXECUTABLE} ${_src} -o ${_out_filename}
DEPENDS ${_src} )
- add_custom_target( "${_out}-${_lang}-translation" ALL DEPENDS ${_out_name} )
- install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${_out_name} RENAME ${_out_real_name} DESTINATION ${_dest} )
+ add_custom_target( "${_out}-${_real_lang}-translation" ALL DEPENDS ${_out_filename} )
+ install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${_out_filename} RENAME ${_install_filename} DESTINATION ${_dest} )
+
endforeach( )
endmacro( )

@ -79,6 +79,7 @@ And it is of course nice to look at. Upstream says:
unset QTDIR QTINC QTLIB unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
# Warning: --enable-gcc-visibility makes decoration unusable.
%configure \ %configure \
--prefix=%{tde_prefix} \ --prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \ --exec-prefix=%{tde_prefix} \
@ -94,7 +95,7 @@ export PATH="%{tde_bindir}:${PATH}"
--enable-new-ldflags \ --enable-new-ldflags \
--enable-closure \ --enable-closure \
--enable-rpath \ --enable-rpath \
--enable-gcc-hidden-visibility --disable-gcc-hidden-visibility
%__make %{?_smp_mflags} %__make %{?_smp_mflags}

@ -0,0 +1,22 @@
--- akode-2.0.2/configure.in.in.ORI 2013-08-10 11:51:41.617074169 +0200
+++ akode-2.0.2/configure.in.in 2013-08-10 11:51:49.295565706 +0200
@@ -55,7 +55,7 @@
dnl without this order in this file, automake will be confused!
dnl
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADER(config.h)
dnl checks for programs.
dnl first check for c/c++ compilers
--- akode-2.0.2/akode/configure.in.in.ORI 2013-08-10 11:53:11.355740687 +0200
+++ akode-2.0.2/akode/configure.in.in 2013-08-10 11:53:18.498367142 +0200
@@ -2,7 +2,7 @@
dnl AC_OUTPUT(akode/akode-config)
dnl AC_OUTPUT(akode/akode.pc)
-AM_CONFIG_HEADER(akode/lib/akode_export.h)
+AC_CONFIG_HEADER(akode/lib/akode_export.h)
AC_DEFUN([AC_CHECK_LIBFLAC],
[

@ -121,6 +121,8 @@ Requires: trinity-kftpgrabber
Requires: trinity-kile Requires: trinity-kile
Requires: trinity-kima Requires: trinity-kima
Requires: trinity-kiosktool Requires: trinity-kiosktool
Requires: trinity-kkbswitch
Requires: trinity-klcddimmer
Requires: trinity-kmplayer Requires: trinity-kmplayer
Requires: trinity-kmyfirewall Requires: trinity-kmyfirewall
Requires: trinity-kmymoney Requires: trinity-kmymoney

@ -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." +msgid "Enables a smooth fading effect when changing background image."
+msgstr "Activer un effet de fondu lors du changement de fond d'écran." +msgstr "Activer un effet de fondu lors du changement de fond d'écran."
diff -Nuar tde-i18n-fr.ORI/messages/tdebase/kcmdisplayconfig.po tde-i18n-fr/messages/tdebase/kcmdisplayconfig.po diff -Nuar tde-i18n-fr.ORI/messages/tdebase/tdecmdisplayconfig.po tde-i18n-fr/messages/tdebase/tdecmdisplayconfig.po
--- tde-i18n-fr.ORI/messages/tdebase/kcmdisplayconfig.po 1970-01-01 01:00:00.000000000 +0100 --- tde-i18n-fr.ORI/messages/tdebase/tdecmdisplayconfig.po 1970-01-01 01:00:00.000000000 +0100
+++ tde-i18n-fr/messages/tdebase/kcmdisplayconfig.po 2013-07-26 20:00:46.303178565 +0200 +++ tde-i18n-fr/messages/tdebase/tdecmdisplayconfig.po 2013-07-26 20:00:46.303178565 +0200
@@ -0,0 +1,188 @@ @@ -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." +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\"." +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..." +msgid "Configure KPowersave..."
+msgstr "Configurer KPowersave..." +msgstr "Configurer KPowersave..."
+ +
diff -Nuar tde-i18n-fr.ORI/messages/tdebase/kcmiccconfig.po tde-i18n-fr/messages/tdebase/kcmiccconfig.po diff -Nuar tde-i18n-fr.ORI/messages/tdebase/tdecmiccconfig.po tde-i18n-fr/messages/tdebase/tdecmiccconfig.po
--- tde-i18n-fr.ORI/messages/tdebase/kcmiccconfig.po 1970-01-01 01:00:00.000000000 +0100 --- tde-i18n-fr.ORI/messages/tdebase/tdecmiccconfig.po 1970-01-01 01:00:00.000000000 +0100
+++ tde-i18n-fr/messages/tdebase/kcmiccconfig.po 2013-07-26 19:48:22.142618069 +0200 +++ tde-i18n-fr/messages/tdebase/tdecmiccconfig.po 2013-07-26 19:48:22.142618069 +0200
@@ -0,0 +1,80 @@ @@ -0,0 +1,80 @@
+# TDE 3.5.13 'iccconfig.cpp' translation +# TDE 3.5.13 'iccconfig.cpp' translation
+ +
@ -1707,7 +1707,7 @@ diff -Nuar tde-i18n-fr.ORI/messages/tdelibs/tdelibs.po tde-i18n-fr/messages/tdel
+++ tde-i18n-fr/messages/tdelibs/tdelibs.po 2013-07-27 10:50:15.966218371 +0200 +++ tde-i18n-fr/messages/tdelibs/tdelibs.po 2013-07-27 10:50:15.966218371 +0200
@@ -5557,137 +5557,146 @@ @@ -5557,137 +5557,146 @@
#: tdeui/kaboutkde.cpp:34 #: tdeui/tdeabouttde.cpp:34
msgid "" msgid ""
-"The <b>K Desktop Environment</b> is written and maintained by the TDE Team, a " -"The <b>K Desktop Environment</b> is written and maintained by the TDE Team, a "
-"world-wide network of software engineers committed to <a " -"world-wide network of software engineers committed to <a "
@ -1749,7 +1749,7 @@ diff -Nuar tde-i18n-fr.ORI/messages/tdelibs/tdelibs.po tde-i18n-fr/messages/tdel
+"href=\"http://www.kde.org/fr\">http://www.kde.org/fr</A> " +"href=\"http://www.kde.org/fr\">http://www.kde.org/fr</A> "
+"pour plus d'informations sur le projet KDE." +"pour plus d'informations sur le projet KDE."
#: tdeui/kaboutkde.cpp:43 #: tdeui/tdeabouttde.cpp:43
msgid "" msgid ""
-"Software can always be improved, and the TDE Team is ready to do so. However, " -"Software can always be improved, and the TDE Team is ready to do so. However, "
-"you - the user - must tell us when something does not work as expected or could " -"you - the user - must tell us when something does not work as expected or could "
@ -1791,7 +1791,7 @@ diff -Nuar tde-i18n-fr.ORI/messages/tdelibs/tdelibs.po tde-i18n-fr/messages/tdel
"système de suivi des bogues pour enregistrer votre souhait. Assurez-vous " "système de suivi des bogues pour enregistrer votre souhait. Assurez-vous "
"d'avoir utilisé l'option « Souhait » (wish)." "d'avoir utilisé l'option « Souhait » (wish)."
#: tdeui/kaboutkde.cpp:54 #: tdeui/tdeabouttde.cpp:54
msgid "" msgid ""
-"You do not have to be a software developer to be a member of the TDE team. You " -"You do not have to be a software developer to be a member of the TDE team. You "
-"can join the national teams that translate program interfaces. You can provide " -"can join the national teams that translate program interfaces. You can provide "
@ -1835,7 +1835,7 @@ diff -Nuar tde-i18n-fr.ORI/messages/tdelibs/tdelibs.po tde-i18n-fr/messages/tdel
+"HREF=\"http://www.trinitydesktop.org/docs/\">http://www.trinitydesktop.org/docs/</A> " +"HREF=\"http://www.trinitydesktop.org/docs/\">http://www.trinitydesktop.org/docs/</A> "
"devrait vous fournir ce dont vous avez besoin." "devrait vous fournir ce dont vous avez besoin."
#: tdeui/kaboutkde.cpp:67 #: tdeui/tdeabouttde.cpp:67
msgid "" msgid ""
-"TDE is available free of charge, but making it is not free." -"TDE is available free of charge, but making it is not free."
-"<br>" -"<br>"
@ -1885,21 +1885,21 @@ diff -Nuar tde-i18n-fr.ORI/messages/tdelibs/tdelibs.po tde-i18n-fr/messages/tdel
+"l'adresse <a href=\"http://www.trinitydesktop.org/donate.php\">http://www.trinitydesktop.org/donate.php</a>." +"l'adresse <a href=\"http://www.trinitydesktop.org/donate.php\">http://www.trinitydesktop.org/donate.php</a>."
+"<br><br>Nous vous remercions vivement de votre soutien." +"<br><br>Nous vous remercions vivement de votre soutien."
#: tdeui/kaboutkde.cpp:81 #: tdeui/tdeabouttde.cpp:81
#, c-format #, c-format
-msgid "K Desktop Environment. Release %1" -msgid "K Desktop Environment. Release %1"
-msgstr "Environnement de bureau TDE. Version %1" -msgstr "Environnement de bureau TDE. Version %1"
+msgid "Trinity Desktop Environment. Release %1" +msgid "Trinity Desktop Environment. Release %1"
+msgstr "Environnement de bureau Trinity. Version %1" +msgstr "Environnement de bureau Trinity. Version %1"
#: tdeui/kaboutkde.cpp:83 #: tdeui/tdeabouttde.cpp:83
msgid "" msgid ""
-"_: About TDE\n" -"_: About TDE\n"
+"_: About Trinity\n" +"_: About Trinity\n"
"&About" "&About"
msgstr "À &propos" msgstr "À &propos"
#: tdeui/kaboutkde.cpp:84 #: tdeui/tdeabouttde.cpp:84
-msgid "&Report Bugs or Wishes" -msgid "&Report Bugs or Wishes"
-msgstr "Rapport de bogues et &souhaits" -msgstr "Rapport de bogues et &souhaits"
+msgid "&Report Bugs/Request Enhancements" +msgid "&Report Bugs/Request Enhancements"
@ -1933,19 +1933,19 @@ diff -Nuar tde-i18n-fr.ORI/messages/tdelibs/tdelibs.po tde-i18n-fr/messages/tdel
+"\n" +"\n"
+"Merci pour votre aide!" +"Merci pour votre aide!"
#: tdeui/kaboutkde.cpp:85 #: tdeui/tdeabouttde.cpp:85
-msgid "&Join the TDE Team" -msgid "&Join the TDE Team"
-msgstr "Re&joignez l'équipe de TDE" -msgstr "Re&joignez l'équipe de TDE"
+msgid "&Join the Trinity Team" +msgid "&Join the Trinity Team"
+msgstr "Re&joignez l'équipe de Trinity" +msgstr "Re&joignez l'équipe de Trinity"
#: tdeui/kaboutkde.cpp:86 #: tdeui/tdeabouttde.cpp:86
-msgid "&Support TDE" -msgid "&Support TDE"
-msgstr "&Soutenez TDE" -msgstr "&Soutenez TDE"
+msgid "&Support Trinity" +msgid "&Support Trinity"
+msgstr "&Soutenez Trinity" +msgstr "&Soutenez Trinity"
#: tdeui/kstdguiitem.cpp:110 khtml/java/kjavaappletserver.cpp:804 #: tdeui/kstdguiitem.cpp:110 tdehtml/java/kjavaappletserver.cpp:804
msgid "&Yes" msgid "&Yes"
@@ -6286,6 +6295,10 @@ @@ -6286,6 +6295,10 @@
msgid "&Browse..." msgid "&Browse..."
@ -1967,5 +1967,5 @@ diff -Nuar tde-i18n-fr.ORI/messages/tdelibs/tdelibs.po tde-i18n-fr/messages/tdel
+msgid "About &Trinity" +msgid "About &Trinity"
+msgstr "À propos de &Trinity" +msgstr "À propos de &Trinity"
#: tdeui/kactionclasses.cpp:2072 #: tdeui/tdeactionclasses.cpp:2072
msgid "Exit F&ull Screen Mode" msgid "Exit F&ull Screen Mode"

@ -57,16 +57,20 @@ BuildRequires: openssl-devel
# DB4 support # DB4 support
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} >= 1220 || 0%{?mdkversion} || 0%{?mgaversion} %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} >= 1220 || 0%{?mdkversion} || 0%{?mgaversion}
%define with_db4 1 %define with_db 1
%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} %if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: db4-devel BuildRequires: db5-devel
%endif %endif
%if 0%{?fedora} >= 18 %if 0%{?fedora} >= 18
BuildRequires: libdb4-cxx-devel BuildRequires: libdb-devel
BuildRequires: libdb-cxx-devel
%endif %endif
%if 0%{?suse_version} %if 0%{?suse_version}
BuildRequires: libdb-4_8-devel BuildRequires: libdb-4_8-devel
%endif %endif
%if 0%{?rhel}
BuildRequires: db4-devel
%endif
%endif %endif
# XMMS support: no, always disabled, even on Fedora # XMMS support: no, always disabled, even on Fedora
@ -636,7 +640,7 @@ of user interfaces, playlists and visualisation plugins.
%{tde_tdelibdir}/noatunlyrics.so %{tde_tdelibdir}/noatunlyrics.so
%{tde_tdelibdir}/noatunmadness.la %{tde_tdelibdir}/noatunmadness.la
%{tde_tdelibdir}/noatunmadness.so %{tde_tdelibdir}/noatunmadness.so
%if 0%{?with_db4} %if 0%{?with_db}
%{tde_tdelibdir}/noatun_oblique.la %{tde_tdelibdir}/noatun_oblique.la
%{tde_tdelibdir}/noatun_oblique.so %{tde_tdelibdir}/noatun_oblique.so
%endif %endif
@ -708,15 +712,12 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
--enable-rpath \ --enable-rpath \
--enable-gcc-hidden-visibility \ --enable-gcc-hidden-visibility \
\ \
--with-extra-includes=%{_includedir}/db4:%{_includedir}/libdb4:%{tde_includedir}/arts \ --with-extra-includes=%{_includedir}/db4:%{_includedir}/db53:%{_includedir}/libdb4:%{tde_includedir}/arts \
\ \
%{?with_xmms:--with-xmms} %{?!with_xmms:--without-xmms} \ %{?with_xmms:--with-xmms} %{?!with_xmms:--without-xmms} \
--with-sdl \ --with-sdl \
%if 0%{?with_db4} %if 0%{?with_db}
--with-berkeley-db \ --with-berkeley-db \
%if 0%{?fedora} >= 18
--with-db-lib=db_cxx-4 \
%endif
%endif %endif

@ -60,8 +60,13 @@ Source6: suse-displaymanagers-tdm
Source7: tdm.service%{?dist} Source7: tdm.service%{?dist}
%endif %endif
# openSUSE 11.4: overwrite distribution-provided '/etc/init.d/xdm' !!!
%if 0%{?suse_version} == 1140
Source7: xdm.oss114
%endif
# Fedora 17: special selinux policy required # Fedora 17: special selinux policy required
%if 0%{?fedora} == 17 || 0%{?rhel} == 6 %if 0%{?fedora} >= 17 || 0%{?rhel} == 6
%define with_selinux_policy 1 %define with_selinux_policy 1
Source8: tdm%{?dist}.pp Source8: tdm%{?dist}.pp
%endif %endif
@ -147,6 +152,19 @@ Requires: fedora-release-notes
%define tde_aboutpage /usr/share/doc/HTML/fedora-release-notes/index.html %define tde_aboutpage /usr/share/doc/HTML/fedora-release-notes/index.html
%endif %endif
# Fedora 19 Theme: "Schroedinger's cat"
%if 0%{?fedora} == 19
Requires: schroedinger-cat-backgrounds-base
%define tde_bg /usr/share/backgrounds/schroedinger-cat/default/standard/schroedinger-cat.jpg
Requires: fedora-logos
%define tde_starticon /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png
Requires: fedora-release-notes
%define tde_aboutlabel Fedora 19
%define tde_aboutpage /usr/share/doc/fedora-release-notes-19/index.html
%endif
# RHEL 4 Theme # RHEL 4 Theme
%if 0%{?rhel} == 4 %if 0%{?rhel} == 4
Requires: desktop-backgrounds-basic Requires: desktop-backgrounds-basic
@ -276,6 +294,18 @@ Requires: opensuse-manuals_en
%define tde_aboutpage /usr/share/doc/manual/opensuse-manuals_en/book.opensuse.startup.html %define tde_aboutpage /usr/share/doc/manual/opensuse-manuals_en/book.opensuse.startup.html
%endif %endif
# OpenSuse 13.1 Theme
%if "%{?suse_version}" == "1310"
Requires: wallpaper-branding
%define tde_bg /usr/share/wallpapers/openSUSEdefault/contents/images/1600x1200.jpg
Requires: hicolor-icon-theme-branding
%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
Requires: opensuse-manuals_en
%define tde_aboutlabel OpenSuse 13.1
%define tde_aboutpage /usr/share/doc/manual/opensuse-manuals_en/book.opensuse.startup.html
%endif
BuildRequires: cmake >= 2.8 BuildRequires: cmake >= 2.8
BuildRequires: trinity-tqt3-devel >= 3.5.0 BuildRequires: trinity-tqt3-devel >= 3.5.0
BuildRequires: trinity-tqtinterface-devel >= %{tde_version} BuildRequires: trinity-tqtinterface-devel >= %{tde_version}

@ -86,7 +86,7 @@ BuildRequires: libgadu-devel
%endif %endif
# XTST support # XTST support
%if 0%{?fedora} >= 5 || 0%{?rhel} >= 5 || 0%{?suse_version} %if 0%{?fedora} >= 5 || 0%{?rhel} >= 5 || 0%{?suse_version} >= 1210
BuildRequires: libXtst-devel BuildRequires: libXtst-devel
%endif %endif
%if 0%{?mdkversion} || 0%{?mgaversion} %if 0%{?mdkversion} || 0%{?mgaversion}

@ -289,9 +289,9 @@ LDAP servers, and SQL databases.
%files -n trinity-kaddressbook %files -n trinity-kaddressbook
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{tde_bindir}/kabc2mutt %{tde_bindir}/tdeabc2mutt
%{tde_bindir}/kaddressbook %{tde_bindir}/kaddressbook
%{tde_bindir}/kabcdistlistupdater %{tde_bindir}/tdeabcdistlistupdater
%{tde_tdelibdir}/kcm_kabconfig.la %{tde_tdelibdir}/kcm_kabconfig.la
%{tde_tdelibdir}/kcm_kabconfig.so %{tde_tdelibdir}/kcm_kabconfig.so
%{tde_tdelibdir}/kcm_kabcustomfields.la %{tde_tdelibdir}/kcm_kabcustomfields.la
@ -323,7 +323,7 @@ LDAP servers, and SQL databases.
%{tde_datadir}/servicetypes/kaddressbook_view.desktop %{tde_datadir}/servicetypes/kaddressbook_view.desktop
%{tde_datadir}/servicetypes/kaddressbook_xxport.desktop %{tde_datadir}/servicetypes/kaddressbook_xxport.desktop
%{tde_tdedocdir}/HTML/en/kaddressbook/ %{tde_tdedocdir}/HTML/en/kaddressbook/
%{tde_datadir}/autostart/kabcdistlistupdater.desktop %{tde_datadir}/autostart/tdeabcdistlistupdater.desktop
%{tde_tdeincludedir}/kaddressbook/ %{tde_tdeincludedir}/kaddressbook/
%{tde_tdeincludedir}/tdeabc/ %{tde_tdeincludedir}/tdeabc/
@ -617,8 +617,8 @@ tracking feature plans.
%{tde_tdelibdir}/knotes_scalix.so %{tde_tdelibdir}/knotes_scalix.so
%{tde_tdelibdir}/knotes_xmlrpc.la %{tde_tdelibdir}/knotes_xmlrpc.la
%{tde_tdelibdir}/knotes_xmlrpc.so %{tde_tdelibdir}/knotes_xmlrpc.so
%{tde_libdir}/libkabckolab.so.* %{tde_libdir}/libtdeabckolab.so.*
%{tde_libdir}/libkabcscalix.so.* %{tde_libdir}/libtdeabcscalix.so.*
%{tde_libdir}/libtdeabc_groupdav.so.* %{tde_libdir}/libtdeabc_groupdav.so.*
%{tde_libdir}/libtdeabc_groupwise.so.* %{tde_libdir}/libtdeabc_groupwise.so.*
%{tde_libdir}/libtdeabc_newexchange.so.* %{tde_libdir}/libtdeabc_newexchange.so.*
@ -725,10 +725,10 @@ Obsoletes: tdepim-tderesources-devel < %{version}-%{release}
%{tde_libdir}/libtdeabc_slox.so %{tde_libdir}/libtdeabc_slox.so
%{tde_libdir}/libtdeabc_xmlrpc.la %{tde_libdir}/libtdeabc_xmlrpc.la
%{tde_libdir}/libtdeabc_xmlrpc.so %{tde_libdir}/libtdeabc_xmlrpc.so
%{tde_libdir}/libkabckolab.la %{tde_libdir}/libtdeabckolab.la
%{tde_libdir}/libkabckolab.so %{tde_libdir}/libtdeabckolab.so
%{tde_libdir}/libkabcscalix.la %{tde_libdir}/libtdeabcscalix.la
%{tde_libdir}/libkabcscalix.so %{tde_libdir}/libtdeabcscalix.so
%{tde_libdir}/libkcal_caldav.la %{tde_libdir}/libkcal_caldav.la
%{tde_libdir}/libkcal_caldav.so %{tde_libdir}/libkcal_caldav.so
%{tde_libdir}/libkcal_groupdav.la %{tde_libdir}/libkcal_groupdav.la
@ -1612,8 +1612,8 @@ This is the runtime package for programs that use the libkcal-trinity library.
%files -n trinity-libkcal %files -n trinity-libkcal
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{tde_tdelibdir}/kcal_kabc.la %{tde_tdelibdir}/kcal_tdeabc.la
%{tde_tdelibdir}/kcal_kabc.so %{tde_tdelibdir}/kcal_tdeabc.so
%{tde_tdelibdir}/kcal_localdir.la %{tde_tdelibdir}/kcal_localdir.la
%{tde_tdelibdir}/kcal_localdir.so %{tde_tdelibdir}/kcal_localdir.so
%{tde_tdelibdir}/kcal_local.la %{tde_tdelibdir}/kcal_local.la
@ -1625,7 +1625,7 @@ This is the runtime package for programs that use the libkcal-trinity library.
%{tde_libdir}/libkholidays.so.* %{tde_libdir}/libkholidays.so.*
%{tde_datadir}/apps/libkholidays %{tde_datadir}/apps/libkholidays
%{tde_datadir}/services/tderesources/kcal/imap.desktop %{tde_datadir}/services/tderesources/kcal/imap.desktop
%{tde_datadir}/services/tderesources/kcal/kabc.desktop %{tde_datadir}/services/tderesources/kcal/tdeabc.desktop
%{tde_datadir}/services/tderesources/kcal/local.desktop %{tde_datadir}/services/tderesources/kcal/local.desktop
%{tde_datadir}/services/tderesources/kcal/localdir.desktop %{tde_datadir}/services/tderesources/kcal/localdir.desktop
%{tde_datadir}/services/tderesources/kcal/remote.desktop %{tde_datadir}/services/tderesources/kcal/remote.desktop

@ -115,6 +115,7 @@ A collection of applications and tools used by developers, including:
* umbrello: UML modeller and UML diagram tool * umbrello: UML modeller and UML diagram tool
%files %files
%defattr(-,root,root,-)
########## ##########
@ -134,6 +135,7 @@ with the commit dialog.
This package is part of Trinity, and a component of the TDE SDK module. This package is part of Trinity, and a component of the TDE SDK module.
%files -n trinity-cervisia %files -n trinity-cervisia
%defattr(-,root,root,-)
%{tde_bindir}/cervisia %{tde_bindir}/cervisia
%{tde_libdir}/libtdeinit_cervisia.la %{tde_libdir}/libtdeinit_cervisia.la
%{tde_libdir}/libtdeinit_cervisia.so %{tde_libdir}/libtdeinit_cervisia.so
@ -215,6 +217,7 @@ for common translations.
This package is part of Trinity, and a component of the TDE SDK module. This package is part of Trinity, and a component of the TDE SDK module.
%files -n trinity-kbabel %files -n trinity-kbabel
%defattr(-,root,root,-)
%{tde_bindir}/catalogmanager %{tde_bindir}/catalogmanager
%{tde_bindir}/kbabel %{tde_bindir}/kbabel
%{tde_bindir}/kbabeldict %{tde_bindir}/kbabeldict
@ -353,6 +356,7 @@ This package contains the KBabel development files.
This package is part of Trinity, and a component of the TDE SDK module. This package is part of Trinity, and a component of the TDE SDK module.
%files -n trinity-kbabel-devel %files -n trinity-kbabel-devel
%defattr(-,root,root,-)
%{tde_tdeincludedir}/kbabel/ %{tde_tdeincludedir}/kbabel/
%{tde_libdir}/libkbabelcommon.la %{tde_libdir}/libkbabelcommon.la
%{tde_libdir}/libkbabelcommon.so %{tde_libdir}/libkbabelcommon.so
@ -379,6 +383,7 @@ variety of options for searching through reports.
This package is part of Trinity, and a component of the TDE SDK module. This package is part of Trinity, and a component of the TDE SDK module.
%files -n trinity-kbugbuster %files -n trinity-kbugbuster
%defattr(-,root,root,-)
%{tde_bindir}/kbugbuster %{tde_bindir}/kbugbuster
%{tde_tdelibdir}/kcal_bugzilla.la %{tde_tdelibdir}/kcal_bugzilla.la
%{tde_tdelibdir}/kcal_bugzilla.so %{tde_tdelibdir}/kcal_bugzilla.so
@ -421,6 +426,7 @@ can be found in the tdecachegrind-converters package.
This package is part of Trinity, and a component of the TDE SDK module. This package is part of Trinity, and a component of the TDE SDK module.
%files -n trinity-tdecachegrind %files -n trinity-tdecachegrind
%defattr(-,root,root,-)
%{tde_bindir}/tdecachegrind %{tde_bindir}/tdecachegrind
%{tde_tdeappdir}/tdecachegrind.desktop %{tde_tdeappdir}/tdecachegrind.desktop
%{tde_datadir}/apps/tdecachegrind/ %{tde_datadir}/apps/tdecachegrind/
@ -467,6 +473,7 @@ and plugin architectures are supported.
This package is part of Trinity, and a component of the TDE SDK module. This package is part of Trinity, and a component of the TDE SDK module.
%files -n trinity-tdecachegrind-converters %files -n trinity-tdecachegrind-converters
%defattr(-,root,root,-)
%{tde_bindir}/dprof2calltree %{tde_bindir}/dprof2calltree
%{tde_bindir}/hotshot2calltree %{tde_bindir}/hotshot2calltree
%{tde_bindir}/memprof2calltree %{tde_bindir}/memprof2calltree
@ -487,6 +494,7 @@ patch files and Qt Linguist data.
This package is part of Trinity, and a component of the TDE SDK module. This package is part of Trinity, and a component of the TDE SDK module.
%files kfile-plugins %files kfile-plugins
%defattr(-,root,root,-)
%{tde_tdelibdir}/tdefile_cpp.so %{tde_tdelibdir}/tdefile_cpp.so
%{tde_tdelibdir}/tdefile_cpp.la %{tde_tdelibdir}/tdefile_cpp.la
%{tde_tdelibdir}/tdefile_diff.so %{tde_tdelibdir}/tdefile_diff.so
@ -517,9 +525,10 @@ Included are:
This package is part of Trinity, and a component of the TDE SDK module. This package is part of Trinity, and a component of the TDE SDK module.
%files misc %files misc
%defattr(-,root,root,-)
%{tde_tdeincludedir}/kprofilemethod.h %{tde_tdeincludedir}/kprofilemethod.h
%{tde_tdelibdir}/kabcformat_kdeaccounts.la %{tde_tdelibdir}/tdeabcformat_kdeaccounts.la
%{tde_tdelibdir}/kabcformat_kdeaccounts.so %{tde_tdelibdir}/tdeabcformat_kdeaccounts.so
%{tde_tdelibdir}/plugins/styles/scheck.so %{tde_tdelibdir}/plugins/styles/scheck.so
%{tde_tdelibdir}/plugins/styles/scheck.la %{tde_tdelibdir}/plugins/styles/scheck.la
%{tde_datadir}/apps/tdeabc/formats/kdeaccountsplugin.desktop %{tde_datadir}/apps/tdeabc/formats/kdeaccountsplugin.desktop
@ -559,6 +568,7 @@ In addition to these scripts, this package provides:
This package is part of Trinity, and a component of the TDE SDK module. This package is part of Trinity, and a component of the TDE SDK module.
%files scripts %files scripts
%defattr(-,root,root,-)
%{tde_bindir}/adddebug %{tde_bindir}/adddebug
%{tde_bindir}/build-progress.sh %{tde_bindir}/build-progress.sh
%{tde_bindir}/cheatmake %{tde_bindir}/cheatmake
@ -649,6 +659,7 @@ KMtrace is a TDE tool to assist with malloc debugging using glibc's
This package is part of Trinity, and a component of the TDE SDK module. This package is part of Trinity, and a component of the TDE SDK module.
%files -n trinity-kmtrace %files -n trinity-kmtrace
%defattr(-,root,root,-)
%{tde_bindir}/demangle %{tde_bindir}/demangle
%{tde_bindir}/kminspector %{tde_bindir}/kminspector
%{tde_bindir}/kmmatch %{tde_bindir}/kmmatch
@ -673,6 +684,7 @@ file and/or blend a diff file back into the original documents.
This package is part of Trinity, and a component of the TDE SDK module. This package is part of Trinity, and a component of the TDE SDK module.
%files -n trinity-kompare %files -n trinity-kompare
%defattr(-,root,root,-)
%{tde_bindir}/kompare %{tde_bindir}/kompare
%{tde_libdir}/libkompareinterface.la %{tde_libdir}/libkompareinterface.la
%{tde_libdir}/libkompareinterface.so %{tde_libdir}/libkompareinterface.so
@ -728,6 +740,7 @@ loaded dynamically using KLibLoader.
This package is part of Trinity, and a component of the TDE SDK module. This package is part of Trinity, and a component of the TDE SDK module.
%files -n trinity-kspy %files -n trinity-kspy
%defattr(-,root,root,-)
%{tde_tdeincludedir}/kspy.h %{tde_tdeincludedir}/kspy.h
%{tde_libdir}/libkspy.la %{tde_libdir}/libkspy.la
%{tde_libdir}/libkspy.so %{tde_libdir}/libkspy.so
@ -755,6 +768,7 @@ The Qt Designer itself is in the package qt3-designer.
This package is part of Trinity, and a component of the TDE SDK module. This package is part of Trinity, and a component of the TDE SDK module.
%files -n trinity-kuiviewer %files -n trinity-kuiviewer
%defattr(-,root,root,-)
%{tde_bindir}/kuiviewer %{tde_bindir}/kuiviewer
%{tde_tdelibdir}/libkuiviewerpart.so %{tde_tdelibdir}/libkuiviewerpart.so
%{tde_tdelibdir}/libkuiviewerpart.la %{tde_tdelibdir}/libkuiviewerpart.la
@ -798,6 +812,7 @@ DCOP is the Desktop Communication Protocol used throughout TDE.
This package is part of Trinity, and a component of the TDE SDK module. This package is part of Trinity, and a component of the TDE SDK module.
%files -n trinity-libcvsservice0 %files -n trinity-libcvsservice0
%defattr(-,root,root,-)
%{tde_bindir}/cvsaskpass %{tde_bindir}/cvsaskpass
%{tde_bindir}/cvsservice %{tde_bindir}/cvsservice
%{tde_libdir}/libcvsservice.so.* %{tde_libdir}/libcvsservice.so.*
@ -834,6 +849,7 @@ Development files for libcvsservice are included in this package.
This package is part of Trinity, and a component of the TDE SDK module. This package is part of Trinity, and a component of the TDE SDK module.
%files -n trinity-libcvsservice-devel %files -n trinity-libcvsservice-devel
%defattr(-,root,root,-)
%{tde_tdeincludedir}/cvsjob_stub.h %{tde_tdeincludedir}/cvsjob_stub.h
%{tde_tdeincludedir}/cvsservice_stub.h %{tde_tdeincludedir}/cvsservice_stub.h
%{tde_tdeincludedir}/repository_stub.h %{tde_tdeincludedir}/repository_stub.h
@ -865,6 +881,7 @@ manipulating DocBook XML files, PO-files and PO-template files.
This package is part of Trinity, and a component of the TDE SDK module. This package is part of Trinity, and a component of the TDE SDK module.
%files -n trinity-poxml %files -n trinity-poxml
%defattr(-,root,root,-)
%{tde_bindir}/po2xml %{tde_bindir}/po2xml
%{tde_bindir}/split2po %{tde_bindir}/split2po
%{tde_bindir}/swappo %{tde_bindir}/swappo
@ -890,6 +907,7 @@ diagrams and deployment diagrams.
This package is part of Trinity, and a component of the TDE SDK module. This package is part of Trinity, and a component of the TDE SDK module.
%files -n trinity-umbrello %files -n trinity-umbrello
%defattr(-,root,root,-)
%{tde_bindir}/umbodoc %{tde_bindir}/umbodoc
%{tde_bindir}/umbrello %{tde_bindir}/umbrello
%{tde_tdeappdir}/umbrello.desktop %{tde_tdeappdir}/umbrello.desktop
@ -937,6 +955,7 @@ filesystem, using URLs like svn://hostname/path, or svn+ssh://, etc.
This package is part of Trinity, and a component of the TDE SDK module. This package is part of Trinity, and a component of the TDE SDK module.
%files tdeio-plugins %files tdeio-plugins
%defattr(-,root,root,-)
%{tde_bindir}/tdeio_svn_helper %{tde_bindir}/tdeio_svn_helper
%{tde_tdelibdir}/kded_ksvnd.la %{tde_tdelibdir}/kded_ksvnd.la
%{tde_tdelibdir}/kded_ksvnd.so %{tde_tdelibdir}/kded_ksvnd.so
@ -1054,6 +1073,7 @@ Provides: trinity-kdesdk-devel = %{version}-%{release}
%{summary}. %{summary}.
%files devel %files devel
%defattr(-,root,root,-)
########## ##########

Loading…
Cancel
Save