Hello community, here is the log from the commit of package kdebase3 for openSUSE:Factory checked in at 2012-04-12 09:30:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdebase3 (Old) and /work/SRC/openSUSE:Factory/.kdebase3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdebase3", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/kdebase3/kdebase3.changes 2012-04-02 10:30:06.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdebase3.new/kdebase3.changes 2012-04-12 09:30:43.000000000 +0200 @@ -1,0 +2,12 @@ +Mon Apr 9 22:40:09 UTC 2012 - [email protected] + +- fix printers.desktop (bnc#631274) + +------------------------------------------------------------------- +Sun Apr 8 15:38:54 UTC 2012 - [email protected] + +- use udisks-glue instead of devmon; implement check whether it is + already running to avoid multiple instances (in case of relogin) +- partial fix for build with gcc4.7 + +------------------------------------------------------------------- Old: ---- devmon-automounter.sh New: ---- kdebase-gcc47.patch printmanager-desktop-fix.patch udisks-glue.conf ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase3.spec ++++++ --- /var/tmp/diff_new_pack.fmDmHC/_old 2012-04-12 09:30:48.000000000 +0200 +++ /var/tmp/diff_new_pack.fmDmHC/_new 2012-04-12 09:30:48.000000000 +0200 @@ -112,7 +112,7 @@ Source9921: kcheckpass-pam-legacy Source22: bnc.desktop Source23: sourceforge.desktop -Source24: devmon-automounter.sh +Source24: udisks-glue.conf Patch0: 3_5_BRANCH.diff Patch3: startkde.diff Patch5: media-iPod.diff @@ -280,6 +280,8 @@ Patch273: systray-icons-style.patch Patch274: applet-no-arrow.patch Patch275: kicker-height.patch +Patch276: kdebase-gcc47.patch +Patch277: printmanager-desktop-fix.patch %description This package contains kdebase, one of the basic packages of the K @@ -317,7 +319,7 @@ %if 0%{?with_hal} > 0 Recommends: kdebase3-with-hal-enabled %else -Recommends: udisks +Recommends: udisks-glue udisks %endif %description workspace @@ -629,6 +631,8 @@ %patch273 -p1 %patch274 -p1 %patch275 -p1 +%patch276 -p1 +%patch277 -p1 %define _mandir /opt/kde3/share/man @@ -693,9 +697,6 @@ install -D -m 0644 %SOURCE21 $RPM_BUILD_ROOT/etc/pam.d/kcheckpass install -m 0644 %SOURCE22 $RPM_BUILD_ROOT/opt/kde3/share/services/searchproviders/ install -m 0644 %SOURCE23 $RPM_BUILD_ROOT/opt/kde3/share/services/searchproviders/ -%if %suse_version < 1011 -mkdir -p $RPM_BUILD_ROOT/usr/X11R6/bin -%endif mkdir -p ${RPM_BUILD_ROOT}/usr/bin \ ${RPM_BUILD_ROOT}/usr/sbin \ ${RPM_BUILD_ROOT}/var/run/xdmctl @@ -838,9 +839,8 @@ 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 +cp -f %{SOURCE24} $RPM_BUILD_ROOT/opt/kde3/share/config +sed -i 5i\ 'killall udisks-glue; /usr/bin/udisks-glue --config /opt/kde3/share/config/udisks-glue.conf' $RPM_BUILD_ROOT/opt/kde3/bin/startkde %endif %pre @@ -1676,7 +1676,7 @@ /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 +/opt/kde3/share/config/udisks-glue.conf %endif %files runtime ++++++ kdebase-gcc47.patch ++++++ diff -wruN kdebase-3.5.10.orig/kicker/applets/launcher/easyvector.h kdebase-3.5.10/kicker/applets/launcher/easyvector.h --- kdebase-3.5.10.orig/kicker/applets/launcher/easyvector.h 2005-09-10 12:25:31.000000000 +0400 +++ kdebase-3.5.10/kicker/applets/launcher/easyvector.h 2012-04-08 19:34:43.631712361 +0400 @@ -87,7 +87,7 @@ template < class VALUE, bool CHECKINDEX > void EasyVector< VALUE, CHECKINDEX >::eraseAt(Index index) { _checkIndex(index); - erase(this->begin()+index); + this->erase(this->begin()+index); } @@ -108,7 +108,7 @@ this->push_back(value); return; } - insert(this->begin()+index,value); + this->insert(this->begin()+index,value); } @@ -116,7 +116,7 @@ void EasyVector< VALUE, CHECKINDEX >::insertAt(EasyVector< VALUE, CHECKINDEX >::Index index,const EasyVector< VALUE, CHECKINDEX > &v) { index=_convertInsertIndex(index); _checkInsertIndex(index); - insert(this->begin()+index,v.begin(),v.end()); + this->insert(this->begin()+index,v.begin(),v.end()); } ++++++ printmanager-desktop-fix.patch ++++++ diff -wruN kdebase-3.5.10.orig/kdeprint/printmgr/printers.desktop kdebase-3.5.10/kdeprint/printmgr/printers.desktop --- kdebase-3.5.10.orig/kdeprint/printmgr/printers.desktop 2008-08-19 22:17:02.000000000 +0400 +++ kdebase-3.5.10/kdeprint/printmgr/printers.desktop 2012-04-10 02:33:37.008350750 +0400 @@ -3,7 +3,6 @@ Icon=printmgr Type=Application DocPath=kdeprint/index.html -MimeType=print/manager; X-KDE-ModuleType=Library X-KDE-Library=printmgr ++++++ udisks-glue.conf ++++++ filter disks { partition_table = false } default { post_insertion_command = "insertion\-notify %device_file" } match disks { automount = true automount_options = { sync, noatime } post_mount_command = "mount\-notify mounted %device_file %mount_point" post_unmount_command = "mount\-notify unmounted %device_file %mount_point" } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
