Hello community,
here is the log from the commit of package kdebase3 for openSUSE:Factory
checked in at Thu Aug 25 10:26:44 CEST 2011.
--------
--- KDE/kdebase3/kdebase3.changes 2011-06-09 21:00:11.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdebase3/kdebase3.changes 2011-08-17
04:42:11.000000000 +0200
@@ -1,0 +2,11 @@
+Wed Aug 17 02:38:36 UTC 2011 - an...@opensuse.org
+
+- reenable and repair MTAB watching in fstab plugin for media autodetection
without HAL
+
+-------------------------------------------------------------------
+Tue Jul 26 10:26:42 UTC 2011 - an...@opensuse.org
+
+- add dependency on libusb-compat-devel to restore Logitech mouse support
+- add a simlink to the screensavers directory to fix the issue of their sudden
disappearance
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
devmon-automounter.sh
mtab-reenable.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebase3.spec ++++++
--- /var/tmp/diff_new_pack.pGcKg0/_old 2011-08-25 10:24:21.000000000 +0200
+++ /var/tmp/diff_new_pack.pGcKg0/_new 2011-08-25 10:24:21.000000000 +0200
@@ -17,12 +17,20 @@
# norootforbuild
+%if %suse_version < 1210
+%define with_hal 1
+%else
+%define with_hal 0
+%endif
Name: kdebase3
BuildRequires: OpenEXR-devel cups-devel db-devel doxygen graphviz
kdelibs3-devel krb5-devel libsmbclient-devel mDNSResponder-devel openldap2
openldap2-devel openmotif openmotif-devel openslp-devel openssh pam-devel
pcsc-lite-devel qt3-devel-doc samba-client utempter xorg-x11
BuildRequires: unsermake xorg-x11-libfontenc-devel
BuildRequires: liblazy-devel
-%if %suse_version < 1210 || 0%{?is_kde_kde3} > 0
+%if %suse_version >= 1130
+BuildRequires: libusb-compat-devel
+%endif
+%if 0%{?with_hal} > 0
BuildRequires: hal-devel
Provides: kdebase3-with-hal-enabled
%endif
@@ -60,7 +68,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Url: http://www.kde.org/
Version: 3.5.10.1
-Release: 17
+Release: 18
%define kde_version 3.5.10
Requires: kdebase3-runtime == %{version}
Source0: kdebase-%{kde_version}.tar.bz2
@@ -88,6 +96,7 @@
Source9921: kcheckpass-pam-legacy
Source22: bnc.desktop
Source23: sourceforge.desktop
+Source24: devmon-automounter.sh
Patch0: 3_5_BRANCH.diff
Patch3: startkde.diff
Patch5: media-iPod.diff
@@ -226,6 +235,7 @@
Patch241: openssl1.patch
Patch242: nsplugin-init-gtk.diff
Patch243: taskbar.patch
+Patch244: mtab-reenable.patch
%description
This package contains kdebase, one of the basic packages of the K
@@ -281,8 +291,8 @@
Requires: kdebase3 == %{version}
Provides: kdebase3:/opt/kde3/bin/kicker
Recommends: kdebase3-ksysguardd == %{version}
-%if 0%{?is_kde_kde3} > 0
-Requires: kdebase3-with-hal-enabled
+%if 0%{?with_hal} > 0
+Recommends: kdebase3-with-hal-enabled
%endif
%description workspace
@@ -474,7 +484,7 @@
Summary: Set and list fileshares
Group: System/Management
Version: 2.0
-Release: 578
+Release: 579
%description -n fileshareset
This package contains the the fileshareset utility to allow users to
@@ -659,6 +669,8 @@
%patch241 -p0
%patch242 -p0
%patch243
+%patch244 -p1
+
rm -rf kappfinder
rm pics/crystalsvg/cr??-*emacs.png
cp %SOURCE17 l10n/tw/flag.png
@@ -865,6 +877,9 @@
mv ${i}_ $i
%suse_update_desktop_file "$i"
done
+install -d $RPM_BUILD_ROOT/opt/kde3/share/applnk/apps
+ln -sf /opt/kde3/share/applnk/System/ScreenSavers
$RPM_BUILD_ROOT/opt/kde3/share/applnk/apps/ScreenSavers
+
for i in $RPM_BUILD_ROOT/opt/kde3/share/applications/kde/*.desktop \
$RPM_BUILD_ROOT/opt/kde3/share/apps/konqueror/servicemenus/*.desktop \
$RPM_BUILD_ROOT/opt/kde3/share/apps/kicker/*/*.desktop \
@@ -900,6 +915,12 @@
# move konqueror.desktop back to old position (#281572)
mv $RPM_BUILD_ROOT/opt/kde3/share/applications/kde/konqueror.desktop
$RPM_BUILD_ROOT/opt/kde3/share/applnk/konqueror.desktop
+%if 0%{?with_hal} == 0
+cp -f %{SOURCE24} $RPM_BUILD_ROOT/opt/kde3/bin
+chmod +x $RPM_BUILD_ROOT/opt/kde3/bin/devmon-automounter.sh
+sed -i 5i\ '/opt/kde3/bin/devmon-automounter.sh &'
$RPM_BUILD_ROOT/opt/kde3/bin/startkde
+%endif
+
%pre
# we have this as link
if test -e opt/kde3/share/apps/ksplash/pics -a ! -L
opt/kde3/share/apps/ksplash/pics ;
@@ -971,7 +992,7 @@
%postun runtime -p /sbin/ldconfig
%post workspace -p /sbin/ldconfig
-%if %suse_version < 1210 || 0%{?is_kde_kde3} > 0
+%if %suse_version > 1110 && 0%{?with_hal} > 0
chkconfig haldaemon on
%endif
@@ -1000,6 +1021,8 @@
%dir /opt/kde3/share/applnk/Settings
%dir /opt/kde3/share/applnk/Settings/WebBrowsing
%dir /opt/kde3/share/applnk/System/ScreenSavers
+%dir /opt/kde3/share/applnk/apps
+/opt/kde3/share/applnk/apps/ScreenSavers
/etc/xdg/menus/*.menu
/etc/xdg/menus/applications-merged
%verify(not mode) %attr(2755,root,nogroup) /opt/kde3/bin/kdesud
@@ -1111,7 +1134,7 @@
/opt/kde3/%_lib/kde3/kded_homedirnotify.so
/opt/kde3/%_lib/kde3/kded_medianotifier.la
/opt/kde3/%_lib/kde3/kded_medianotifier.so
-%if %suse_version < 1210 || 0%{?is_kde_kde3} > 0
+%if 0%{?with_hal} > 0
/opt/kde3/%_lib/kde3/media_propsdlgplugin.*
%endif
/opt/kde3/%_lib/kde3/kcm_kded.*
@@ -1223,8 +1246,9 @@
/opt/kde3/share/mimelnk/inode/system_directory.desktop
/opt/kde3/share/services/kded/remotedirnotify.desktop
/opt/kde3/share/services/kded/systemdirnotify.desktop
-%if %suse_version < 1210 || 0%{?is_kde_kde3} > 0
+%if 0%{?with_hal} > 0
/opt/kde3/share/services/media_propsdlgplugin.desktop
+
%endif
%config(noreplace) /opt/kde3/share/config/kshorturifilterrc
%config(noreplace) /opt/kde3/share/config/kxkb_groups
@@ -1782,6 +1806,9 @@
/opt/kde3/%_lib/libksgrd.so.*
/opt/kde3/bin/kompmgr
%doc %lang(en) /opt/kde3/share/doc/HTML/en/kompmgr
+%if 0%{?with_hal} == 0
+/opt/kde3/bin/devmon-automounter.sh
+%endif
%files runtime
%defattr(-,root,root)
++++++ devmon-automounter.sh ++++++
++++ 1086 lines (skipped)
++++++ mtab-reenable.patch ++++++
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
@@ -50,7 +50,7 @@
#define MTAB "/etc/mnttab"
#else
#define FSTAB "/etc/fstab"
-#define MTAB "/etc/mtab"
+#define MTAB "/proc/self/mounts"
#endif
@@ -58,7 +58,7 @@
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);
connect( KDirWatch::self(), SIGNAL( dirty(const QString&) ),
@@ -94,7 +94,7 @@
m_mediaList.removeMedium(*it, false);
}
KDirWatch::self()->removeFile(FSTAB);
- KDirWatch::self()->removeFile(MTAB);
+ KDirWatch::self()->removeDir("/media");
}
QString FstabBackend::mount( const QString &_udi )
@@ -119,8 +119,9 @@
void FstabBackend::slotDirty(const QString &path)
{
- if (path==MTAB)
+ if (path=="/media")
{
+ sleep(1);
handleMtabChange();
}
else if (path==FSTAB)
@@ -136,18 +137,23 @@
|| mount->mountType() == "sysfs"
|| mount->mountType() == "fdescfs"
|| mount->mountType() == "kernfs"
+ || mount->mountType() == "devtmpfs"
+ || mount->mountType() == "rootfs"
|| mount->mountType() == "usbfs"
|| mount->mountType().contains( "proc" )
+ || mount->mountType().contains( "gvfs" )
|| mount->mountType() == "unknown"
|| mount->mountType() == "none"
|| mount->mountType() == "sunrpc"
|| mount->mountedFrom() == "none"
|| mount->mountedFrom() == "tmpfs"
|| mount->mountedFrom().find("shm") != -1
- || mount->mountPoint() == "/dev/swap"
+ || !(mount->mountPoint() == "/" || mount->mountPoint().find("/media")
== 0 )
+/* || mount->mountPoint() == "/dev/swap"
+ || mount->mountPoint() == "/dev"
|| mount->mountPoint() == "/dev/pts"
|| mount->mountPoint().find("/proc") == 0
- || mount->mountPoint().find("/sys") == 0
+ || mount->mountPoint().find("/sys") == 0 */
// We might want to display only network shares
// since HAL doesn't handle them
@@ -187,10 +193,12 @@
nothing has changed, do not stat the mount point. Avoids
hang if network shares are stalling */
QString mtabEntry = dev + "*" + mp + "*" + fs;
+#if 0
if(m_mtabEntries.contains(mtabEntry)) {
new_mtabIds += m_mtabEntries[mtabEntry];
continue;
}
+#endif
QString id = generateId(dev, mp);
new_mtabIds+=id;
@@ -203,7 +211,6 @@
m_mediaList.changeMediumState(id, true, false,
mime, icon, label);
}
-#if 0
else if ( !m_mtabIds.contains(id) )
{
QString name = generateName(dev, fs);
@@ -219,9 +226,8 @@
m->setIconName(icon);
m->setLabel(label);
- m_mediaList.addMedium(m, notificationAllowed);
+ m_mediaList.addMedium(m, allowNotification);
}
-#endif
}
QStringList::iterator it2 = m_mtabIds.begin();
@@ -247,12 +253,10 @@
m_mediaList.changeMediumState(*it2, false, false,
mime, icon, label);
}
-#if 0
else if ( !new_mtabIds.contains(*it2) )
{
m_mediaList.removeMedium(*it2, allowNotification);
}
-#endif
}
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
@@ -27,7 +27,7 @@
#ifdef _OS_SOLARIS_
#define MTAB "/etc/mnttab"
#else
-#define MTAB "/etc/mtab"
+#define MTAB "/proc/self/mounts"
#endif
@@ -35,7 +35,7 @@
RemovableBackend::RemovableBackend(MediaList &list)
: QObject(), BackendBase(list)
{
- KDirWatch::self()->addFile(MTAB);
+ KDirWatch::self()->addDir("/media",0);
connect( KDirWatch::self(), SIGNAL( dirty(const QString&) ),
this, SLOT( slotDirty(const QString&) ) );
@@ -52,7 +52,7 @@
m_mediaList.removeMedium(*it, false);
}
- KDirWatch::self()->removeFile(MTAB);
+ KDirWatch::self()->removeDir("/media");
}
bool RemovableBackend::plug(const QString &devNode, const QString &label)
@@ -116,8 +116,9 @@
void RemovableBackend::slotDirty(const QString &path)
{
- if (path==MTAB)
+ if (path=="/media")
{
+ sleep(1);
handleMtabChange();
}
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
