Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging

9 files changed, 16 insertions, 181 deletions

diff --git a/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0-fix_gtk3_segv.patch b/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0-fix_gtk3_segv.patch
deleted file mode 100644
index 73021cb11..000000000
--- a/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0-fix_gtk3_segv.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- gtk-qt-engine/kcm_gtk/kcmgtk.cpp.ORI	2013-07-23 23:35:16.614406882 +0200
-+++ gtk-qt-engine/kcm_gtk/kcmgtk.cpp	2013-07-23 23:56:39.121594541 +0200
-@@ -261,13 +261,21 @@
- 		}
- 	}
- 	
-+	bool gtk3installed = false;
- 	widget->styleBox3->clear();
- 	TQStringList otherGtk3Styles = gtk3Themes.keys();
--	otherGtk3Styles.remove(otherGtk3Styles.find("tdegtk"));
--	widget->styleBox3->insertStringList(otherGtk3Styles);
--	
--	bool gtk3installed = (gtk3Themes.find("tdegtk") != gtk3Themes.end());
-+	if(!otherGtk3Styles.empty()) {
-+		otherGtk3Styles.remove(otherGtk3Styles.find("tdegtk"));
-+		if(!otherGtk3Styles.empty()) {
-+			gtk3installed = (gtk3Themes.find("tdegtk") != gtk3Themes.end());
-+		}
-+	}
-+	if(gtk3installed) {
-+		widget->styleBox3->insertStringList(otherGtk3Styles);
-+	}
- 	widget->styleKde3->setEnabled(gtk3installed);
-+	widget->styleBox3->setEnabled(gtk3installed);
-+	widget->styleOther3->setEnabled(gtk3installed);
- 	widget->warning4->setHidden(gtk3installed);
- 	widget->warning5->setHidden(gtk3installed);
- 	widget->warning6->setHidden(gtk3installed);
diff --git a/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec b/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec
index d51ec3f2e..79c275e09 100644
--- a/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec
+++ b/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec
@@ -44,7 +44,7 @@ Source1:		gtk-qt-engine.rc.sh
 Source2:		gtkrc-2.0-kde4
 Source3:		gtkrc-2.0-kde-kde4
 
-Patch1:			gtk-qt-engine-14.0.0-fix_gtk3_segv.patch
+Patch0:			gtk-qt-engine-14.0.0-debug.patch
 
 BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
 BuildRequires:	trinity-arts-devel >= 1:1.5.10
@@ -72,7 +72,7 @@ a way to configure it from within KControl.
 
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%patch1 -p1 -b .segv
+%patch0 -p1 -b .debug
 
 
 %build
diff --git a/redhat/applications/kbfx/kbfx-14.0.0.spec b/redhat/applications/kbfx/kbfx-14.0.0.spec
index b8be0817c..8661e7e81 100644
--- a/redhat/applications/kbfx/kbfx-14.0.0.spec
+++ b/redhat/applications/kbfx/kbfx-14.0.0.spec
@@ -105,13 +105,13 @@ cd build
   -DDATA_INSTALL_DIR=%{tde_datadir}/apps \
   -DMIME_INSTALL_DIR=%{tde_datadir}/mimelnk \
   -DXDG_APPS_INSTALL_DIR=%{tde_tdeappdir} \
+  -DSHARE_INSTALL_PREFIX="%{tde_datadir}"\
   -DDOC_INSTALL_DIR=%{tde_tdedocdir} \
   -DLIB_INSTALL_DIR=%{tde_libdir} \
   \
   -DUSE_STRIGI=OFF \
   -DUSE_MENUDRAKE=OFF \
-  -DBUILD_DOC=ON \
-  -DBUILD_ALL=OFF \
+  -DBUILD_ALL=ON \
   ..
 
 # Not SMP safe !
@@ -166,12 +166,14 @@ update-desktop-database %{tde_appdir} &> /dev/null
 %{tde_datadir}/apps/kicker/applets/kbfxspinx.desktop
 %{tde_datadir}/apps/konqueror/servicemenus/kbfx_install_theme.desktop
 %{tde_datadir}/apps/konqueror/servicemenus/kbfx_prepare_theme.desktop
-#%{tde_tdedocdir}/HTML/en/common/kbfx-*.jpg
-#%{tde_tdedocdir}/HTML/en/kbfxconfigapp/
-%{tde_tdedocdir}/kbfx/
+%{tde_tdedocdir}/HTML/en/kbfxconfigapp/
+%{tde_docdir}/kbfx/
 %{tde_datadir}/icons/hicolor/*/apps/kbfx.png
 %{tde_datadir}/icons/hicolor/*/apps/kbfxconfigapp.png
-#%{tde_datadir}/locale/*/LC_MESSAGES/kbfxconfigapp.mo
+%lang(bg) %{tde_datadir}/locale/bg/LC_MESSAGES/kbfxconfigapp.mo
+%lang(hu) %{tde_datadir}/locale/hu/LC_MESSAGES/kbfxconfigapp.mo
+%lang(it) %{tde_datadir}/locale/it/LC_MESSAGES/kbfxconfigapp.mo
+%lang(nl) %{tde_datadir}/locale/nl/LC_MESSAGES/kbfxconfigapp.mo
 %{tde_datadir}/mimelnk/application/x-kbfxtheme.desktop
 
 
diff --git a/redhat/applications/klcddimmer/klcddimmer-14.0.0.spec b/redhat/applications/klcddimmer/klcddimmer-14.0.0.spec
index de2535703..337caedd4 100644
--- a/redhat/applications/klcddimmer/klcddimmer-14.0.0.spec
+++ b/redhat/applications/klcddimmer/klcddimmer-14.0.0.spec
@@ -99,8 +99,6 @@ export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
-%find_lang %{tde_pkg}
-
 
 %clean
 %__rm -rf %{buildroot}
@@ -115,7 +113,7 @@ touch --no-create %{tde_datadir}/icons/hicolor || :
 gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
 
-%files -f %{tde_pkg}.lang
+%files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING LICENSE NEWS README
 %{tde_libdir}/klcddimmer_panelapplet.la
diff --git a/redhat/applications/soundkonverter/soundkonverter-14.0.0.spec b/redhat/applications/soundkonverter/soundkonverter-14.0.0.spec
index 971e26a8c..14c2f88d8 100644
--- a/redhat/applications/soundkonverter/soundkonverter-14.0.0.spec
+++ b/redhat/applications/soundkonverter/soundkonverter-14.0.0.spec
@@ -111,9 +111,7 @@ export PATH="%{tde_bindir}:${PATH}"
   --enable-new-ldflags \
   --enable-closure \
   --enable-rpath \
-  --enable-gcc-hidden-visibility \
-  \
-  --with-extra-includes=/usr/include/cdda
+  --enable-gcc-hidden-visibility
    
 %__make %{?_smp_mflags}
 
diff --git a/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec b/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec
index 1cd956ab3..65838ef05 100644
--- a/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec
+++ b/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec
@@ -46,7 +46,7 @@ BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-Patch1:			tde-guidance-14.0.0-tqt3.patch
+#Patch1:			tde-guidance-14.0.0-tqt3.patch
 
 BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
 BuildRequires:	trinity-arts-devel >= 1:1.5.10
@@ -146,7 +146,9 @@ or can be run as standalone applications.
 %exclude %{tde_datadir}/apps/guidance/MonitorsDB
 
 # Files from powermanager
+%if 0%{?with_powermanager}
 %exclude %{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png
+%endif
 %exclude %{tde_datadir}/apps/guidance/pics/ac-adapter.png
 %exclude %{tde_datadir}/apps/guidance/pics/battery*.png
 %exclude %{tde_datadir}/apps/guidance/pics/processor.png
@@ -259,7 +261,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%patch1 -p1 -b .tqt3
+#patch1 -p1 -b .tqt3
 
 %if 0%{?rhel} || 0%{?mgaversion} || 0%{?mdkversion}
 %__sed -i "userconfig/unixauthdb.py" \
diff --git a/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec b/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec
index 2dd719162..121915ed9 100644
--- a/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec
+++ b/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec
@@ -41,10 +41,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-Patch1:		trinity-cmake-translations.patch
-Patch2:		tdepowersave-cmake-add-translation-and-documentation.patch
-Patch3:		tdepowersave-14.0.0-test.patch
-
 BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
 BuildRequires:	trinity-arts-devel >= 1:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
@@ -91,9 +87,6 @@ settings for:
 
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%patch1 -p1 -b .lang
-%patch2 -p1 -b .lang
-#patch3 -p1 -b .test
 
 
 %build
diff --git a/redhat/applications/tdepowersave/tdepowersave-cmake-add-translation-and-documentation.patch b/redhat/applications/tdepowersave/tdepowersave-cmake-add-translation-and-documentation.patch
deleted file mode 100644
index a30f264a4..000000000
--- a/redhat/applications/tdepowersave/tdepowersave-cmake-add-translation-and-documentation.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- 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
deleted file mode 100644
index d97302ba3..000000000
--- a/redhat/applications/tdepowersave/trinity-cmake-translations.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-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( )