diff options
Diffstat (limited to 'redhat/applications')
7 files changed, 154 insertions, 15 deletions
diff --git a/redhat/applications/koffice/koffice-14.0.0.spec b/redhat/applications/koffice/koffice-14.0.0.spec index 1ce075d4e..a9c8dc953 100644 --- a/redhat/applications/koffice/koffice-14.0.0.spec +++ b/redhat/applications/koffice/koffice-14.0.0.spec @@ -275,7 +275,7 @@ fi %{tde_tdelibdir}/koshell.* %{tde_tdelibdir}/kthesaurus.* %{tde_tdelibdir}/kwmailmerge_classic.* -%{tde_tdelibdir}/kwmailmerge_kabc.* +%{tde_tdelibdir}/kwmailmerge_tdeabc.* %{tde_tdelibdir}/kwmailmerge_qtsqldb_power.* %{tde_tdelibdir}/kwmailmerge_qtsqldb.* %{tde_tdelibdir}/libkounavailpart.* diff --git a/redhat/applications/tdeio-apt/tdeio-apt-14.0.0.spec b/redhat/applications/tdeio-apt/tdeio-apt-14.0.0.spec index 8bcdd6a10..9c9f75b14 100644 --- a/redhat/applications/tdeio-apt/tdeio-apt-14.0.0.spec +++ b/redhat/applications/tdeio-apt/tdeio-apt-14.0.0.spec @@ -100,14 +100,14 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -%find_lang kio-apt +%find_lang %{tde_pkg} %clean %__rm -rf %{buildroot} -%files -f kio-apt.lang +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) %doc AUTHORS CHANGELOG ChangeLog COPYING %{tde_tdelibdir}/tdeio_apt.la diff --git a/redhat/applications/tdeio-locate/tdeio-locate-14.0.0.spec b/redhat/applications/tdeio-locate/tdeio-locate-14.0.0.spec index 3c16ff3d1..9af8444f9 100644 --- a/redhat/applications/tdeio-locate/tdeio-locate-14.0.0.spec +++ b/redhat/applications/tdeio-locate/tdeio-locate-14.0.0.spec @@ -25,7 +25,7 @@ Name: trinity-%{tde_pkg} -Summary: kio-slave for the locate command [Trinity] +Summary: tdeio-slave for the locate command [Trinity] Version: 0.4.5 Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} @@ -107,19 +107,19 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -C build -%find_lang kio-locate +%find_lang %{tde_pkg} %clean %__rm -rf %{buildroot} -%files -f kio-locate.lang +%files -f %{tde_pkg}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING TODO %{tde_tdelibdir}/tdeio_locate.la %{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/locater.protocol %{tde_datadir}/services/rlocate.protocol diff --git a/redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec b/redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec index 46c09b1c2..b1d694e7f 100644 --- a/redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec +++ b/redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec @@ -51,18 +51,27 @@ BuildRequires: gettext Obsoletes: trinity-knetworkmanager < %{version}-%{release} Provides: trinity-knetworkmanager = %{version}-%{release} +# NETWORKMANAGER support %if 0%{?rhel} || 0%{?fedora} Requires: NetworkManager-gnome -%else +%endif +%if 0%{?mdkversion} || 0%{?mgaversion} Requires: networkmanager %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-tqt-devel >= 1:0.63 -BuildRequires: NetworkManager-glib-devel %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. @@ -72,7 +81,7 @@ Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel -Development headers for knetworkmanager +Development headers for tdenetworkmanager %if 0%{?suse_version} || 0%{?pclinuxos} @@ -88,10 +97,8 @@ Development headers for knetworkmanager unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" 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 cd build %endif @@ -166,6 +173,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %{tde_tdelibdir}/*.la %{tde_tdelibdir}/*.so + %changelog * Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.9-1 - Initial release for TDE 14.0.0 diff --git a/redhat/applications/tdepowersave/tdepowersave-cmake-add-translation-and-documentation.patch b/redhat/applications/tdepowersave/tdepowersave-cmake-add-translation-and-documentation.patch new file mode 100644 index 000000000..a30f264a4 --- /dev/null +++ b/redhat/applications/tdepowersave/tdepowersave-cmake-add-translation-and-documentation.patch @@ -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 ) diff --git a/redhat/applications/tdepowersave/trinity-cmake-translations.patch b/redhat/applications/tdepowersave/trinity-cmake-translations.patch new file mode 100644 index 000000000..d97302ba3 --- /dev/null +++ b/redhat/applications/tdepowersave/trinity-cmake-translations.patch @@ -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( ) diff --git a/redhat/applications/twin-style-crystal/twin-style-crystal-14.0.0.spec b/redhat/applications/twin-style-crystal/twin-style-crystal-14.0.0.spec index 67a4e4b7a..d96a0462a 100644 --- a/redhat/applications/twin-style-crystal/twin-style-crystal-14.0.0.spec +++ b/redhat/applications/twin-style-crystal/twin-style-crystal-14.0.0.spec @@ -79,6 +79,7 @@ And it is of course nice to look at. Upstream says: unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" +# Warning: --enable-gcc-visibility makes decoration unusable. %configure \ --prefix=%{tde_prefix} \ --exec-prefix=%{tde_prefix} \ @@ -94,7 +95,7 @@ export PATH="%{tde_bindir}:${PATH}" --enable-new-ldflags \ --enable-closure \ --enable-rpath \ - --enable-gcc-hidden-visibility + --disable-gcc-hidden-visibility %__make %{?_smp_mflags} |