RPM Packaging: more updates

4 files changed, 225 insertions, 15 deletions

diff --git a/redhat/tdelibs/tdelibs-14.0.0-cups_by_default.patch b/redhat/tdelibs/tdelibs-14.0.0-cups_by_default.patch
new file mode 100644
index 000000000..2f281cf04
--- /dev/null
+++ b/redhat/tdelibs/tdelibs-14.0.0-cups_by_default.patch
@@ -0,0 +1,33 @@
+--- ./tdeprint/kmfactory.cpp.ORI	2013-05-09 00:14:51.664045869 +0200
++++ ./tdeprint/kmfactory.cpp	2013-05-09 00:16:59.154367127 +0200
+@@ -249,8 +249,21 @@
+ 		conf->writeEntry("PrintSystem", sys);
+ 		conf->sync();
+ 	}
+-	else if ( sys.length()==1 && sys[0].isDigit() ) // discard old-style settings
++	else if ( sys.length()==1 && sys[0].isDigit() ) { // discard old-style settings
+         	sys = "lpdunix";
++	} else {
++		//Always Autodetect
++		//it will not try autodetect if user changes any option
++		//when user force some option, AlwaysSearch will be "no" and then
++		//kprinter will not to try autodetect again.
++		if(conf->readEntry("AlwaysSearch") != "no" ) {
++			sys = autoDetect();
++			conf->writeEntry("PrintSystem",sys);
++			conf->writeEntry("AlwaysSearch","yes");
++			conf->sync();
++		}
++	}
++
+ 	return sys;
+ }
+ 
+@@ -278,6 +291,7 @@
+ 	{
+ 		TDEConfig	*conf = printConfig();
+ 		conf->setGroup("General");
++		conf->writeEntry("AlwaysSearch","no");
+ 		conf->writeEntry("PrintSystem", syst);
+ 		conf->sync();
+ 
diff --git a/redhat/tdelibs/tdelibs-14.0.0-fix_battery_charge.patch b/redhat/tdelibs/tdelibs-14.0.0-fix_battery_charge.patch
new file mode 100644
index 000000000..2b09620bb
--- /dev/null
+++ b/redhat/tdelibs/tdelibs-14.0.0-fix_battery_charge.patch
@@ -0,0 +1,18 @@
+--- trinity-tdelibs-14.0.0~pre596+d6816283/tdecore/tdehardwaredevices.cpp.batterycharge	2013-07-07 11:55:57.000000000 +0200
++++ trinity-tdelibs-14.0.0~pre596+d6816283/tdecore/tdehardwaredevices.cpp	2013-07-08 20:21:00.196653825 +0200
+@@ -4704,6 +4704,15 @@
+ 					if (nodename == "alarm") {
+ 						bdevice->internalSetAlarmEnergy(line.toDouble()/1000000.0);
+ 					}
++					if (nodename == "charge_full") {
++						bdevice->internalSetMaximumEnergy(line.toDouble()/1000000.0);
++					}
++					if (nodename == "charge_full_design") {
++						bdevice->internalSetMaximumDesignEnergy(line.toDouble()/1000000.0);
++					}
++					if (nodename == "charge_now") {
++						bdevice->internalSetEnergy(line.toDouble()/1000000.0);
++					}
+ 					if (nodename == "energy_full") {
+ 						bdevice->internalSetMaximumEnergy(line.toDouble()/1000000.0);
+ 					}
diff --git a/redhat/tdelibs/tdelibs-14.0.0-xdg_dirs_set_path.patch b/redhat/tdelibs/tdelibs-14.0.0-xdg_dirs_set_path.patch
new file mode 100644
index 000000000..f32dec25b
--- /dev/null
+++ b/redhat/tdelibs/tdelibs-14.0.0-xdg_dirs_set_path.patch
@@ -0,0 +1,150 @@
+--- ./tdecore/tdeglobalsettings.h.Ori	2013-05-08 22:16:42.771982104 +0200
++++ ./tdecore/tdeglobalsettings.h	2013-05-08 22:18:33.882577602 +0200
+@@ -253,6 +253,29 @@
+      */
+     static TQString documentPath() { initStatic(); return *s_documentPath; }
+ 
++    /**
++     * The path where documents are stored of the current user.
++     * @return the path of the videos directory
++     */
++    static TQString videosPath() { initStatic(); return *s_videosPath; }
++
++    /**
++     * The path where documents are stored of the current user.
++     * @return the path of the music directory
++     */
++    static TQString musicPath() { initStatic(); return *s_musicPath; }
++
++    /**
++     * The path where documents are stored of the current user.
++     * @return the path of the downloads directory
++     */
++    static TQString downloadPath() { initStatic(); return *s_downloadPath; }
++
++    /**
++     * The path where documents are stored of the current user.
++     * @return the path of the pictures directory
++     */
++    static TQString picturesPath() { initStatic(); return *s_picturesPath; }
+ 
+     /**
+      * The default color to use when highlighting toolbar buttons.
+@@ -560,6 +583,10 @@
+     static TQString* s_autostartPath;
+     static TQString* s_trashPath;
+     static TQString* s_documentPath;
++    static TQString* s_picturesPath;
++    static TQString* s_downloadPath;
++    static TQString* s_musicPath;
++    static TQString* s_videosPath;
+     static TQFont *_generalFont;
+     static TQFont *_fixedFont;
+     static TQFont *_toolBarFont;
+--- ./tdecore/tdeglobalsettings.cpp.xdg_path	2013-01-09 19:23:09.000000000 +0100
++++ ./tdecore/tdeglobalsettings.cpp	2013-05-08 22:26:26.451376166 +0200
+@@ -62,6 +62,10 @@
+ TQString* TDEGlobalSettings::s_autostartPath = 0;
+ TQString* TDEGlobalSettings::s_trashPath = 0;
+ TQString* TDEGlobalSettings::s_documentPath = 0;
++TQString* TDEGlobalSettings::s_videosPath = 0;
++TQString* TDEGlobalSettings::s_musicPath = 0;
++TQString* TDEGlobalSettings::s_downloadPath = 0;
++TQString* TDEGlobalSettings::s_picturesPath = 0;
+ TQFont *TDEGlobalSettings::_generalFont = 0;
+ TQFont *TDEGlobalSettings::_fixedFont = 0;
+ TQFont *TDEGlobalSettings::_toolBarFont = 0;
+@@ -83,7 +87,7 @@
+ 
+ // helper function for reading xdg user dirs: it is required in order to take 
+ // care of locale stuff
+-void readXdgUserDirs(TQString *desktop, TQString *documents)
++void readXdgUserDirs(TQString *desktop, TQString *documents, TQString *videos, TQString *music, TQString *download, TQString *pictures)
+ {
+ 	TQFile f( TQDir::homeDirPath() + "/.config/user-dirs.dirs" );
+ 
+@@ -101,6 +105,14 @@
+ 			*desktop = line.remove("XDG_DESKTOP_DIR=").remove("\"").replace("$HOME", TQDir::homeDirPath());
+ 		else if (line.startsWith("XDG_DOCUMENTS_DIR="))
+ 			*documents = line.remove("XDG_DOCUMENTS_DIR=").remove("\"").replace("$HOME", TQDir::homeDirPath());
++		else if (line.startsWith("XDG_MUSIC_DIR="))
++			*videos = line.remove("XDG_MUSIC_DIR=").remove("\"").replace("$HOME", TQDir::homeDirPath());
++		else if (line.startsWith("XDG_DOWNLOAD_DIR="))
++			*download = line.remove("XDG_DOWNLOAD_DIR=").remove("\"").replace("$HOME", TQDir::homeDirPath());
++		else if (line.startsWith("XDG_VIDEOS_DIR="))
++			*music = line.remove("XDG_VIDEOS_DIR=").remove("\"").replace("$HOME", TQDir::homeDirPath());
++		else if (line.startsWith("XDG_PICTURES_DIR="))
++			*pictures = line.remove("XDG_PICTURES_DIR=").remove("\"").replace("$HOME", TQDir::homeDirPath());
+ 
+ 		line = s.readLine();
+ 	}
+@@ -515,30 +527,45 @@
+     s_autostartPath = new TQString();
+     s_trashPath = new TQString();
+     s_documentPath = new TQString();
++    s_videosPath = new TQString();
++    s_musicPath = new TQString();
++    s_downloadPath = new TQString();
++    s_picturesPath = new TQString();
++
+ 
+     TDEConfigGroup g( TDEGlobal::config(), "Paths" );
+ 
+-	// Read desktop and documents path using XDG_USER_DIRS
+-	readXdgUserDirs(s_desktopPath, s_documentPath);
++    // Read desktop and documents path using XDG_USER_DIRS
++    readXdgUserDirs(s_desktopPath, s_documentPath, s_musicPath, s_videosPath, s_downloadPath, s_picturesPath);
+ 	
+     if (s_desktopPath->isEmpty() == true) {
+       *s_desktopPath = TQDir::homeDirPath() + "/Desktop/";
+     }
++
+     *s_desktopPath = TQDir::cleanDirPath( *s_desktopPath );
+     if ( !s_desktopPath->endsWith("/") )
+       s_desktopPath->append('/');
+ 
+-    if (s_documentPath->isEmpty() == true) {
+-#ifdef Q_WS_WIN
+-      *s_documentPath = getWin32ShellFoldersPath("Personal");
+-#else
+-      *s_documentPath = TQDir::homeDirPath() + "/Documents/";
+-#endif
+-    }
+     *s_documentPath = TQDir::cleanDirPath( *s_documentPath );
+     if ( !s_documentPath->endsWith("/"))
+       s_documentPath->append('/');
+ 
++    *s_musicPath = TQDir::cleanDirPath( *s_musicPath );
++    if ( !s_musicPath->endsWith("/"))
++      s_musicPath->append('/');
++
++    *s_videosPath = TQDir::cleanDirPath( *s_videosPath );
++    if ( !s_videosPath->endsWith("/"))
++      s_videosPath->append('/');
++
++    *s_downloadPath = TQDir::cleanDirPath( *s_downloadPath );
++    if ( !s_downloadPath->endsWith("/"))
++      s_downloadPath->append('/');
++
++    *s_picturesPath = TQDir::cleanDirPath( *s_picturesPath );
++    if ( !s_picturesPath->endsWith("/"))
++      s_picturesPath->append('/');
++
+     // Trash Path - TODO remove in KDE4 (tdeio_trash can't use it for interoperability reasons)
+     *s_trashPath = *s_desktopPath + i18n("Trash") + "/";
+     *s_trashPath = g.readPathEntry( "Trash" , *s_trashPath);
+@@ -603,6 +630,14 @@
+     s_desktopPath = 0L;
+     delete s_documentPath;
+     s_documentPath = 0L;
++    delete s_videosPath;
++    s_videosPath = 0L;
++    delete s_picturesPath;
++    s_picturesPath = 0L;
++    delete s_downloadPath;
++    s_downloadPath = 0L;
++    delete s_musicPath;
++    s_musicPath = 0L;
+ }
+ 
+ TDEGlobalSettings::KMouseSettings & TDEGlobalSettings::mouseSettings()
diff --git a/redhat/tdelibs/tdelibs-14.0.0.spec b/redhat/tdelibs/tdelibs-14.0.0.spec
index 37d2bf0ff..f301dae6a 100644
--- a/redhat/tdelibs/tdelibs-14.0.0.spec
+++ b/redhat/tdelibs/tdelibs-14.0.0.spec
@@ -32,6 +32,12 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
 
+# Patches from Mandriva
+Patch1:		tdelibs-14.0.0-xdg_dirs_set_path.patch
+Patch2:		tdelibs-14.0.0-cups_by_default.patch
+
+# Fix battery charge detection
+Patch3:		tdelibs-14.0.0-fix_battery_charge.patch
 
 Obsoletes:	tdelibs < %{version}-%{release}
 Provides:	tdelibs = %{version}-%{release}
@@ -232,13 +238,13 @@ kimgio (image manipulation).
 %{tde_bindir}/tdecmshell
 %{tde_bindir}/tdeconf_update
 %{tde_bindir}/kcookiejar
-%{tde_bindir}/[kt]de-config
-%{tde_bindir}/[kt]de-menu
+%{tde_bindir}/tde-config
+%{tde_bindir}/tde-menu
 %{tde_bindir}/kded
-%{tde_bindir}/[kt]deinit
-%{tde_bindir}/[kt]deinit_shutdown
-%{tde_bindir}/[kt]deinit_wrapper
-%{tde_bindir}/[kt]desu_stub
+%{tde_bindir}/tdeinit
+%{tde_bindir}/tdeinit_shutdown
+%{tde_bindir}/tdeinit_wrapper
+%{tde_bindir}/tdesu_stub
 %{tde_bindir}/kdetcompmgr
 %{tde_bindir}/kdontchangethehostname
 %{tde_bindir}/tdedostartupconfig
@@ -265,8 +271,8 @@ kimgio (image manipulation).
 %{tde_bindir}/make_driver_db_lpr
 %{tde_bindir}/meinproc
 %{tde_bindir}/networkstatustestservice
-%{tde_bindir}/start_[kt]deinit
-%{tde_bindir}/start_[kt]deinit_wrapper
+%{tde_bindir}/start_tdeinit
+%{tde_bindir}/start_tdeinit_wrapper
 %attr(4755,root,root) %{tde_bindir}/kgrantpty
 %{tde_bindir}/tde_dbus_hardwarecontrol
 %{tde_bindir}/checkXML
@@ -275,9 +281,9 @@ kimgio (image manipulation).
 %{tde_bindir}/preparetips
 %{tde_tdelibdir}/*
 %{tde_libdir}/lib*.so.*
-%{tde_libdir}/lib[kt]deinit_*.la
-%{tde_libdir}/lib[kt]deinit_*.so
-%{tde_datadir}/applications/[kt]de/*.desktop
+%{tde_libdir}/libtdeinit_*.la
+%{tde_libdir}/libtdeinit_*.so
+%{tde_datadir}/applications/tde/*.desktop
 %{tde_datadir}/autostart/tdeab2tdeabc.desktop
 %{tde_datadir}/applnk/tdeio_iso.desktop
 %{tde_datadir}/apps/*
@@ -333,16 +339,16 @@ applications for TDE.
 %defattr(-,root,root,-)
 %{tde_bindir}/dcopidl*
 %{tde_bindir}/*config_compiler
-%{tde_bindir}/make[kt]dewidgets
+%{tde_bindir}/maketdewidgets
 %{tde_datadir}/apps/ksgmltools2/
 %{tde_tdeincludedir}/*
 %{tde_libdir}/*.la
 %{tde_libdir}/*.so
 %{tde_libdir}/*.a
 %{tde_libdir}/pkgconfig/tdelibs.pc
-%exclude %{tde_libdir}/lib[kt]deinit_*.la
-%exclude %{tde_libdir}/lib[kt]deinit_*.so
-%{tde_datadir}/cmake/[kt]delibs.cmake
+%exclude %{tde_libdir}/libtdeinit_*.la
+%exclude %{tde_libdir}/libtdeinit_*.so
+%{tde_datadir}/cmake/tdelibs.cmake
 
 %post devel
 /sbin/ldconfig || :
@@ -360,6 +366,9 @@ applications for TDE.
 
 %prep
 %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
+%patch1 -p1 -b .xdg_path
+%patch2 -p1 -b .cups_by_default
+%patch3 -p1 -b .batterycharge
 
 
 %build