commit kdebase3 for openSUSE:Factory

2 Apr 2012

Hello community,

here is the log from the commit of package kdebase3 for openSUSE:Factory checked in at 2012-04-02 10:29:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kdebase3 (Old)
 and      /work/SRC/openSUSE:Factory/.kdebase3.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "kdebase3", Maintainer is "kde-maintainers@suse.de"

Changes:
--------

--- /work/SRC/openSUSE:Factory/kdebase3/kdebase3.changes	2012-03-29 11:40:48.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.kdebase3.new/kdebase3.changes	2012-04-02 10:30:06.000000000 +0200
@@ -1,0 +2,7 @@
+Fri Mar 30 15:38:38 UTC 2012 - anixx@opensuse.org
+
+- recommend udisks so to ensure that udisks-1 is installed,
+  for automount script
+- watch also /run/mount/utab for future udisks-2 compatibility
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kdebase3.spec ++++++
--- /var/tmp/diff_new_pack.EuxjHl/_old	2012-04-02 10:30:10.000000000 +0200
+++ /var/tmp/diff_new_pack.EuxjHl/_new	2012-04-02 10:30:10.000000000 +0200
@@ -316,6 +316,8 @@
 Recommends:     kdebase3-ksysguardd == %{version}
 %if 0%{?with_hal} > 0
 Recommends:     kdebase3-with-hal-enabled
+%else
+Recommends:     udisks
 %endif
 
 %description workspace




++++++ mtab-reenable.patch ++++++
--- /var/tmp/diff_new_pack.EuxjHl/_old	2012-04-02 10:30:10.000000000 +0200
+++ /var/tmp/diff_new_pack.EuxjHl/_new	2012-04-02 10:30:10.000000000 +0200
@@ -1,6 +1,6 @@
 diff -wruN kdebase-3.5.10.orig/kioslave/media/mediamanager/fstabbackend.cpp kdebase-3.5.10/kioslave/media/mediamanager/fstabbackend.cpp
 --- kdebase-3.5.10.orig/kioslave/media/mediamanager/fstabbackend.cpp	2006-10-01 21:31:54.000000000 +0400
-+++ kdebase-3.5.10/kioslave/media/mediamanager/fstabbackend.cpp	2011-08-17 14:51:34.697199962 +0400
++++ kdebase-3.5.10/kioslave/media/mediamanager/fstabbackend.cpp	2012-03-30 09:31:42.911936175 +0400
 @@ -50,7 +50,7 @@
  #define MTAB "/etc/mnttab"
  #else
@@ -10,36 +10,47 @@
  #endif
  
  
-@@ -58,7 +58,7 @@
+@@ -58,8 +58,9 @@
  FstabBackend::FstabBackend(MediaList &list, bool networkSharesOnly)
  	: QObject(), BackendBase(list), m_networkSharesOnly(networkSharesOnly)
  {
 -	KDirWatch::self()->addFile(MTAB);
 +	KDirWatch::self()->addDir("/media",0);
  	KDirWatch::self()->addFile(FSTAB);
++	KDirWatch::self()->addDir("/run/mount/utab",0);
  
  	connect( KDirWatch::self(), SIGNAL( dirty(const QString&) ),
-@@ -94,7 +94,7 @@
+ 	         this, SLOT( slotDirty(const QString&) ) );
+@@ -94,7 +95,8 @@
  		m_mediaList.removeMedium(*it, false);
  	}
          KDirWatch::self()->removeFile(FSTAB);
 -        KDirWatch::self()->removeFile(MTAB);
 +        KDirWatch::self()->removeDir("/media");
++        KDirWatch::self()->removeDir("/run/mount/utab");
  }
  
  QString FstabBackend::mount( const QString &_udi )
-@@ -119,8 +119,9 @@
+@@ -119,13 +121,14 @@
  
  void FstabBackend::slotDirty(const QString &path)
  {
 -	if (path==MTAB)
-+	if (path=="/media")
++	if (path==FSTAB)
  	{
+-		handleMtabChange();
++		handleFstabChange();
+ 	}
+-	else if (path==FSTAB)
++	else
+ 	{
+-		handleFstabChange();
 +		sleep(1);
- 		handleMtabChange();
++		handleMtabChange();
  	}
- 	else if (path==FSTAB)
-@@ -136,18 +137,23 @@
+ }
+ 
+@@ -136,18 +139,23 @@
  	  || mount->mountType() == "sysfs"
  	  || mount->mountType() == "fdescfs"
  	  || mount->mountType() == "kernfs"
@@ -65,7 +76,7 @@
  
  	  // We might want to display only network shares
  	  // since HAL doesn't handle them
-@@ -187,10 +193,12 @@
+@@ -187,10 +195,12 @@
  		   nothing has changed, do not stat the mount point. Avoids
  		   hang if network shares are stalling */
  		QString mtabEntry = dev + "*" + mp + "*" + fs;
@@ -78,7 +89,7 @@
  
  		QString id = generateId(dev, mp);
  		new_mtabIds+=id;
-@@ -203,7 +211,6 @@
+@@ -203,7 +213,6 @@
  			m_mediaList.changeMediumState(id, true, false,
  			                              mime, icon, label);
  		}
@@ -86,7 +97,7 @@
  		else if ( !m_mtabIds.contains(id) )
  		{
  			QString name = generateName(dev, fs);
-@@ -219,9 +226,8 @@
+@@ -219,9 +228,8 @@
  			m->setIconName(icon);
  			m->setLabel(label);
  
@@ -97,7 +108,7 @@
  	}
  
  	QStringList::iterator it2 = m_mtabIds.begin();
-@@ -247,12 +253,10 @@
+@@ -247,12 +255,10 @@
  			m_mediaList.changeMediumState(*it2, false, false,
  			                              mime, icon, label);
  		}
@@ -112,7 +123,7 @@
  	m_mtabIds = new_mtabIds;
 diff -wruN kdebase-3.5.10.orig/kioslave/media/mediamanager/removablebackend.cpp kdebase-3.5.10/kioslave/media/mediamanager/removablebackend.cpp
 --- kdebase-3.5.10.orig/kioslave/media/mediamanager/removablebackend.cpp	2006-03-17 13:17:33.000000000 +0300
-+++ kdebase-3.5.10/kioslave/media/mediamanager/removablebackend.cpp	2011-08-17 14:51:51.854357476 +0400
++++ kdebase-3.5.10/kioslave/media/mediamanager/removablebackend.cpp	2012-03-30 08:41:04.856935421 +0400
 @@ -27,7 +27,7 @@
  #ifdef _OS_SOLARIS_
  #define MTAB "/etc/mnttab"



-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

commit kdebase3 for openSUSE:Factory

root＠hilbert.suse.de