packages: xfce4-mount-plugin/xfce4-mount-plugin.spec, xfce4-mount-plugin/xf...

[baggins]

Author: baggins                      Date: Sat Nov 13 20:50:41 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2
- fix mounting by label and unmounting by label and uuid

---- Files affected:
packages/xfce4-mount-plugin:
   xfce4-mount-plugin.spec (1.16 -> 1.17) , xfce4-mount-plugin-label-uuid.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/xfce4-mount-plugin/xfce4-mount-plugin.spec
diff -u packages/xfce4-mount-plugin/xfce4-mount-plugin.spec:1.16 packages/xfce4-mount-plugin/xfce4-mount-plugin.spec:1.17
--- packages/xfce4-mount-plugin/xfce4-mount-plugin.spec:1.16	Sun Mar  1 17:45:48 2009
+++ packages/xfce4-mount-plugin/xfce4-mount-plugin.spec	Sat Nov 13 21:50:36 2010
@@ -3,15 +3,13 @@
 Summary(pl.UTF-8):	Narzędzie do montowania/odmontowywania dla panelu Xfce
 Name:		xfce4-mount-plugin
 Version:	0.5.5
-Release:	1
+Release:	2
 License:	GPL v2+
 Group:		X11/Applications
-Source0:	http://goodies.xfce.org/releases/xfce4-mount-plugin/%{name}-%{version}.tar.bz2
+Source0:	http://archive.xfce.org/src/panel-plugins/xfce4-mount-plugin/0.5/%{name}-%{version}.tar.bz2
 # Source0-md5:	1d237468fe23e4e8c29195d9b99c4c5d
+Patch0:		%{name}-label-uuid.patch
 URL:		http://goodies.xfce.org/projects/panel-plugins/xfce4-mount-plugin
-BuildRequires:	autoconf
-BuildRequires:	automake
-BuildRequires:	intltool
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.311
 BuildRequires:	xfce4-dev-tools >= 4.4.0
@@ -31,13 +29,9 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
-%{__intltoolize}
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}
 %configure \
 	--disable-static
 
@@ -76,6 +70,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.17  2010/11/13 20:50:36  baggins
+- rel 2
+- fix mounting by label and unmounting by label and uuid
+
 Revision 1.16  2009/03/01 16:45:48  megabajt
 - updated to 0.5.5
 - removed obsolete -locale-names.patch

================================================================
Index: packages/xfce4-mount-plugin/xfce4-mount-plugin-label-uuid.patch
diff -u /dev/null packages/xfce4-mount-plugin/xfce4-mount-plugin-label-uuid.patch:1.1
--- /dev/null	Sat Nov 13 21:50:41 2010
+++ packages/xfce4-mount-plugin/xfce4-mount-plugin-label-uuid.patch	Sat Nov 13 21:50:36 2010
@@ -0,0 +1,21 @@
+--- xfce4-mount-plugin-0.5.5/panel-plugin/devices.c~	2010-11-13 20:45:44.969354996 +0100
++++ xfce4-mount-plugin-0.5.5/panel-plugin/devices.c	2010-11-13 21:02:11.907383494 +0100
+@@ -295,7 +295,8 @@
+             retval = ERROR;
+         }
+ 
+-        if (disk_check_mounted(pdisk->device))
++        if (disk_check_mounted(pdisk->device) ||
++		disk_check_mounted(pdisk->mount_point))
+             retval = ERROR;
+ 
+         g_free (cmd);
+@@ -331,7 +331,7 @@
+     for (pfstab = getfsent(); pfstab!=NULL; pfstab = getfsent())
+     {
+         has_valid_mount_device =
+-                        g_str_has_prefix(pfstab->fs_spec, "/dev/") ||  g_str_has_prefix(pfstab->fs_spec, "UUID=");
++                        g_str_has_prefix(pfstab->fs_spec, "/dev/") || g_str_has_prefix(pfstab->fs_spec, "UUID=") || g_str_has_prefix(pfstab->fs_spec, "LABEL=");
+ 
+         if (include_NFSs)
+             has_valid_mount_device = has_valid_mount_device |
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xfce4-mount-plugin/xfce4-mount-plugin.spec?r1=1.16&r2=1.17&f=u