rpms/kdelibs/FC-5 kdelibs-3.5.2-cupsdconf2-group.patch, NONE, 1.1 kdelibs-3.5.2-kio_file.patch, NONE, 1.1 kde.csh, 1.1, 1.2 kde.sh, 1.1, 1.2 kdelibs.spec, 1.129, 1.130

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Tue May 23 14:15:58 UTC 2006 

Author: than

Update of /cvs/dist/rpms/kdelibs/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv21441

Modified Files:
	kde.csh kde.sh kdelibs.spec 
Added Files:
	kdelibs-3.5.2-cupsdconf2-group.patch 
	kdelibs-3.5.2-kio_file.patch 
Log Message:
- fix #189677, No longer possible to "copy & rename" file in same directory
- fix #192585, kdeprint writes incorrect cupsd.conf
- fix #178323, add KDE_IS_PRELINKED/KDE_NO_IPV60


kdelibs-3.5.2-cupsdconf2-group.patch:
 cupsd.conf.template |    4 ++--
 cupsdconf.cpp       |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE kdelibs-3.5.2-cupsdconf2-group.patch ---
--- kdelibs-3.5.2/kdeprint/cups/cupsdconf2/cupsd.conf.template.tn	2006-05-22 14:51:46.000000000 +0200
+++ kdelibs-3.5.2/kdeprint/cups/cupsdconf2/cupsd.conf.template	2006-05-22 15:27:27.000000000 +0200
@@ -275,9 +275,9 @@
 # must be <b>sys</b>, however you can configure things for another
 # group as needed.</p>
 # <p>
-# <i>ex</i>: sys</p>
+# <i>ex</i>: lp</p>
 $$
-#Group sys
+#Group lp
 @@
 
 %%ripcache
--- kdelibs-3.5.2/kdeprint/cups/cupsdconf2/cupsdconf.cpp.tn	2006-05-22 15:26:15.000000000 +0200
+++ kdelibs-3.5.2/kdeprint/cups/cupsdconf2/cupsdconf.cpp	2006-05-22 15:26:32.000000000 +0200
@@ -115,7 +115,7 @@
 	maxjobsperprinter_ = 0;
 	maxjobsperuser_ = 0;
 	user_ = "lp";
-	group_ = "sys";
+	group_ = "lp";
 	ripcache_ = "8m";
 	filterlimit_ = 0;
 	browsing_ = true;

kdelibs-3.5.2-kio_file.patch:
 job.cpp |   22 +++++++++++++++-------
 1 files changed, 15 insertions(+), 7 deletions(-)

--- NEW FILE kdelibs-3.5.2-kio_file.patch ---
--- kdelibs-3.5.2/kio/kio/job.cpp.me	2006-05-23 15:23:56.000000000 +0200
+++ kdelibs-3.5.2/kio/kio/job.cpp	2006-05-23 15:24:06.000000000 +0200
@@ -2786,7 +2786,7 @@
     {
         m_conflictError = job->error();
         if ( (m_conflictError == ERR_DIR_ALREADY_EXIST)
-             || (m_conflictError == ERR_FILE_ALREADY_EXIST) )
+             || (m_conflictError == ERR_FILE_ALREADY_EXIST) ) // can't happen?
         {
             KURL oldURL = ((SimpleJob*)job)->url();
             // Should we skip automatically ?
@@ -3050,7 +3050,8 @@
             m_conflictError = job->error(); // save for later
             // Existing dest ?
             if ( ( m_conflictError == ERR_FILE_ALREADY_EXIST )
-                 || ( m_conflictError == ERR_DIR_ALREADY_EXIST ) )
+                 || ( m_conflictError == ERR_DIR_ALREADY_EXIST )
+                 || ( m_conflictError == ERR_IDENTICAL_FILES ) )
             {
                 subjobs.remove( job );
                 assert ( subjobs.isEmpty() );
@@ -3132,7 +3133,8 @@
         m_reportTimer->stop();
 
     if ( ( m_conflictError == ERR_FILE_ALREADY_EXIST )
-      || ( m_conflictError == ERR_DIR_ALREADY_EXIST ) )
+         || ( m_conflictError == ERR_DIR_ALREADY_EXIST )
+         || ( m_conflictError == ERR_IDENTICAL_FILES ) )
     {
         // Its modification time:
         time_t destmtime = (time_t)-1;
@@ -3161,6 +3163,7 @@
         // Offer overwrite only if the existing thing is a file
         // If src==dest, use "overwrite-itself"
         RenameDlg_Mode mode;
+        bool isDir = true;
 
         if( m_conflictError == ERR_DIR_ALREADY_EXIST )
             mode = (RenameDlg_Mode) 0;
@@ -3172,6 +3175,7 @@
                 mode = M_OVERWRITE_ITSELF;
             else
                 mode = M_OVERWRITE;
+            isDir = false;
         }
 
 	if ( m_bSingleFileCopy )
@@ -3179,7 +3183,7 @@
 	else
             mode = (RenameDlg_Mode) ( mode | M_MULTI | M_SKIP );
 
-        res = Observer::self()->open_RenameDlg( this, m_conflictError == ERR_FILE_ALREADY_EXIST ?
+        res = Observer::self()->open_RenameDlg( this, !isDir ?
                                 i18n("File Already Exists") : i18n("Already Exists as Folder"),
                                 (*it).uSource.url(),
                                 (*it).uDest.url(),
@@ -3602,7 +3606,9 @@
         // In that case it's the _same_ dir, we don't want to copy+del (data loss!)
         if ( m_currentSrcURL.isLocalFile() && m_currentSrcURL.url(-1) != dest.url(-1) &&
              m_currentSrcURL.url(-1).lower() == dest.url(-1).lower() &&
-             ( err == ERR_FILE_ALREADY_EXIST || err == ERR_DIR_ALREADY_EXIST ) )
+             ( err == ERR_FILE_ALREADY_EXIST ||
+               err == ERR_DIR_ALREADY_EXIST ||
+               err == ERR_IDENTICAL_FILES ) )
         {
             kdDebug(7007) << "Couldn't rename directly, dest already exists. Detected special case of lower/uppercase renaming in same dir, try with 2 rename calls" << endl;
             QCString _src( QFile::encodeName(m_currentSrcURL.path()) );
@@ -3643,7 +3649,9 @@
         Q_ASSERT( m_currentSrcURL == *m_currentStatSrc );
 
         // Existing dest?
-        if ( ( err == ERR_DIR_ALREADY_EXIST || err == ERR_FILE_ALREADY_EXIST )
+        if ( ( err == ERR_DIR_ALREADY_EXIST ||
+               err == ERR_FILE_ALREADY_EXIST ||
+               err == ERR_IDENTICAL_FILES )
              && isInteractive() )
         {
             if (m_reportTimer)
@@ -3693,7 +3701,7 @@
 
                 RenameDlg_Result r = Observer::self()->open_RenameDlg(
                     this,
-                    err == ERR_FILE_ALREADY_EXIST ? i18n("File Already Exists") : i18n("Already Exists as Folder"),
+                    err != ERR_DIR_ALREADY_EXIST ? i18n("File Already Exists") : i18n("Already Exists as Folder"),
                     m_currentSrcURL.url(),
                     dest.url(),
                     mode, newPath,


Index: kde.csh
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/FC-5/kde.csh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kde.csh	9 Sep 2004 07:05:04 -0000	1.1
+++ kde.csh	23 May 2006 14:15:55 -0000	1.2
@@ -1,3 +1,14 @@
+# When/if using prelinking, avoids (some) use of kdeinit
+if ( -f /etc/sysconfig/prelink ) then
+   set PRELINKING = `cat /etc/sysconfig/prelink | grep "^PRELINKING=" | cut -d"=" -f2`
+   if ( "$PRELINKING" == "yes" )  then
+      if ( ! $?KDE_IS_PRELINKED ) setenv KDE_IS_PRELINKED 1
+   endif
+endif
+
+# if not using IP6, speeds DNS operations
+# if ( ! $?KDE_NO_IPV6 ) setenv KDE_NO_IPV6 1 
+
 # Make sure KDEDIR is set
 if ( $?KDEDIR ) then
 	exit


Index: kde.sh
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/FC-5/kde.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kde.sh	9 Sep 2004 07:05:04 -0000	1.1
+++ kde.sh	23 May 2006 14:15:55 -0000	1.2
@@ -1,3 +1,14 @@
+# When/if using prelinking, avoids (some) use of kdeinit
+if [ -f /etc/sysconfig/prelink ] ; then
+   source /etc/sysconfig/prelink
+   if [ "$PRELINKING" == yes ] ; then
+      [ -z "$KDE_IS_PRELINKED" ] && KDE_IS_PRELINKED=1 && export KDE_IS_PRELINKED
+   fi
+fi
+
+# if not using IP6, speeds DNS operations
+# [ -z "$KDE_NO_IPV6" ] && KDE_NO_IPV6=1 && export KDE_NO_IPV6
+
 # Make sure KDEDIR is set
 [ -z "$KDEDIR" ] && KDEDIR="/usr"
 export KDEDIR


Index: kdelibs.spec
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/FC-5/kdelibs.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- kdelibs.spec	9 May 2006 21:52:42 -0000	1.129
+++ kdelibs.spec	23 May 2006 14:15:55 -0000	1.130
@@ -24,7 +24,7 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Version: 3.5.2
-Release: 0.2.fc5
+Release: 0.3.fc5
 Summary: K Desktop Environment - Libraries
 Name: kdelibs
 Url: http://www.kde.org/
@@ -53,10 +53,12 @@
 Patch35: kdelibs-3.4.92-inttype.patch
 Patch36: kdelibs-3.5.0-modular-x.patch
 Patch37: kdelibs-3.5.2-kdebug-kmail-quiet.patch
+Patch38: kdelibs-3.5.2-cupsdconf2-group.patch
 
 # upstream patches
 Patch100: kdelibs-3.5.2-kdeprint.patch 
 Patch101: kdelibs-3.5.2-cups-api.patch
+Patch102: kdelibs-3.5.2-kio_file.patch
 
 %if %{arts}
 Requires: arts >= %{arts_epoch}:%{arts_version}
@@ -187,10 +189,12 @@
 %patch35 -p1 -b .inttype
 %patch36 -p1 -b .modular-x
 %patch37 -p1 -b .kdebug-kmail-quiet
+%patch38 -p1 -b .cupsdconf2-group
 
 # upstream patches
 %patch100 -p1 -b .kdeprint
 %patch101 -p1 -b .cups-api
+%patch102 -p1 -b .kio_file
  
 # add redhat into KDE_VERSION_STRING
 %if %{redhatify}
@@ -395,6 +399,11 @@
 %doc %{_docdir}/HTML/en/kdelibs*
 
 %changelog
+* Tue May 23 2006 Than Ngo <than at redhat.com> 3.5.2-0.3.fc5
+- fix #189677, No longer possible to "copy & rename" file in same directory
+- fix #192585, kdeprint writes incorrect cupsd.conf
+- fix #178323, add KDE_IS_PRELINKED/KDE_NO_IPV60
+
 * Tue May 09 2006 Than Ngo <than at redhat.com> 6:3.5.2-0.2.fc5 
 - fix #173235, disable kmail debug info #173235
 - don't use private API with newer CUPS >=1.2

More information about the fedora-cvs-commits mailing list