Hello community, here is the log from the commit of package gnome-volume-manager checked in at Wed Nov 1 23:47:48 CET 2006. -------- --- GNOME/gnome-volume-manager/gnome-volume-manager.changes 2006-10-16 21:32:00.000000000 +0200 +++ /mounts/work_src_done/STABLE/gnome-volume-manager/gnome-volume-manager.changes 2006-11-01 17:55:22.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Nov 1 17:55:05 CET 2006 - fejj@suse.de + +- Updated suse-autorun.patch to apply cleanly + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-volume-manager.spec ++++++ --- /var/tmp/diff_new_pack.AkuKQh/_old 2006-11-01 23:47:37.000000000 +0100 +++ /var/tmp/diff_new_pack.AkuKQh/_new 2006-11-01 23:47:37.000000000 +0100 @@ -15,7 +15,7 @@ %define prefix /opt/gnome %define sysconfdir /etc%{prefix} Version: 2.15.0 -Release: 14 +Release: 24 URL: http://www.gnome.org/ Group: System/GUI/GNOME License: GNU General Public License (GPL) - all versions @@ -25,11 +25,11 @@ Source2: cdda-url-handler.schemas Source3: add-unknown-printer Patch0: gvm-schema-defaults.patch -Patch2: suse-autorun.patch -Patch7: 153241.patch -Patch9: gnome-volume-manager-po.patch -Patch11: 196281.patch -Patch12: mount-opts-wildcard.patch +Patch1: suse-autorun.patch +Patch2: 153241.patch +Patch3: gnome-volume-manager-po.patch +Patch4: 196281.patch +Patch5: mount-opts-wildcard.patch Autoreqprov: on Requires: control-center2 Requires: notification-daemon @@ -57,11 +57,11 @@ %prep %setup -q %patch -#%patch2 -%patch7 -#%patch9 -%patch11 -%patch12 +%patch1 +%patch2 +#%patch3 +%patch4 +%patch5 %build autoconf @@ -81,7 +81,7 @@ unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL install -d $RPM_BUILD_ROOT/opt/gnome/lib/gnome-volume-manager install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/opt/gnome/lib/gnome-volume-manager/gnome-cdda-handler -install -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{sysconfdir}/gconf/schemas/cdda-url-handler.schemas +install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{sysconfdir}/gconf/schemas/cdda-url-handler.schemas install -m 755 %{SOURCE3} $RPM_BUILD_ROOT/opt/gnome/bin/add-unknown-printer %find_lang %{name} %suse_update_desktop_file gnome-volume-properties X-SuSE-ControlCenter-Hardware @@ -110,6 +110,8 @@ %dir /opt/gnome/share/locale/dz/LC_MESSAGES %changelog -n gnome-volume-manager +* Wed Nov 01 2006 - fejj@suse.de +- Updated suse-autorun.patch to apply cleanly * Mon Oct 16 2006 - danw@suse.de - Remove dead patches * Thu Oct 12 2006 - fejj@suse.de ++++++ suse-autorun.patch ++++++ --- /var/tmp/diff_new_pack.AkuKQh/_old 2006-11-01 23:47:38.000000000 +0100 +++ /var/tmp/diff_new_pack.AkuKQh/_new 2006-11-01 23:47:38.000000000 +0100 @@ -1,19 +1,51 @@ +? 119900.patch +? 153241.patch +? 158750.patch +? 196281.patch +? 334540.patch +? 337839.patch +? 338323.patch +? INSTALL +? add-unknown-printer.sh +? autogen +? bnc-196281.patch +? depcomp +? foo +? gvm-schema-defaults.patch +? mount-opts-wildcard.patch +? novell.schemas.in +? releases +? suse-autorun.patch +? ui-string-changes.patch +? po/stamp-it +? src/TODO +? src/fmask.patch +? src/foo +? src/getopts +? src/getopts.c +? src/getopts.h +? src/mtab +? src/mtab.c +? src/mtab.h +? src/path +? src/path.c Index: src/manager.c =================================================================== RCS file: /cvs/gnome/gnome-volume-manager/src/manager.c,v -retrieving revision 1.123 -diff -u -r1.123 manager.c ---- src/manager.c 30 Jan 2006 17:20:57 -0000 1.123 -+++ src/manager.c 30 Jan 2006 17:38:14 -0000 -@@ -1144,6 +1144,30 @@ - char **autorun; - int i; - +retrieving revision 1.154 +diff -u -r1.154 manager.c +--- src/manager.c 12 Oct 2006 19:43:28 -0000 1.154 ++++ src/manager.c 1 Nov 2006 16:54:01 -0000 +@@ -1289,6 +1289,31 @@ + } + + if (config.autorun && config.autorun_path) { + if (TRUE) { + char *command, *path; ++ struct stat st; + + path = g_build_filename (mount_point, "setup.sh", NULL); -+ if (access (path, R_OK | X_OK) == 0) { ++ if (stat (path, &st) == 0 && S_ISREG (st.st_mode) && access (path, R_OK | X_OK) == 0) { + command = g_strdup_printf ("gnomesu %s", path); + gvm_run_command (command, NULL, NULL, NULL); + g_free (command); @@ -23,7 +55,7 @@ + + g_free (path); + path = g_build_filename (mount_point, "media.1", "patches", NULL); -+ if (access (path, R_OK | X_OK) == 0) { ++ if (stat (path, &st) == 0 && S_ISDIR (st.st_mode) && access (path, R_OK | X_OK) == 0) { + command = "gnomesu /sbin/yast2 online_update .cd_default"; + gvm_run_command (command, NULL, NULL, NULL); + g_free (path); @@ -33,6 +65,15 @@ + g_free (path); + } + - autorun = g_strsplit (config.autorun_path, ":", -1); + autopath = g_strsplit (config.autorun_path, ":", -1); - for (i = 0; autorun[i]; i++) { + for (i = 0; autopath[i]; i++) { +@@ -2917,7 +2942,7 @@ + + for (i = 0; i < num_volumes; i++) { + udi = volumes[i]; +- ++ + if (gvm_udi_is_subfs_mount (udi)) { + #ifdef ENABLE_NOTIFY + statfs_mount_info_add (udi); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org