packages: xfce4-mount-plugin/xfce4-mount-plugin-label-uuid.patch, xfce4-mou...

[baggins]

Author: baggins                      Date: Thu May 17 19:54:30 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 0.6.4

---- Files affected:
packages/xfce4-mount-plugin:
   xfce4-mount-plugin-label-uuid.patch (1.1 -> 1.2) , xfce4-mount-plugin.spec (1.22 -> 1.23) , xfce4-mount-plugin-ui.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/xfce4-mount-plugin/xfce4-mount-plugin-label-uuid.patch
diff -u packages/xfce4-mount-plugin/xfce4-mount-plugin-label-uuid.patch:1.1 packages/xfce4-mount-plugin/xfce4-mount-plugin-label-uuid.patch:1.2
--- packages/xfce4-mount-plugin/xfce4-mount-plugin-label-uuid.patch:1.1	Sat Nov 13 21:50:36 2010
+++ packages/xfce4-mount-plugin/xfce4-mount-plugin-label-uuid.patch	Thu May 17 21:54:24 2012
@@ -1,16 +1,15 @@
 --- 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;
-         }
+@@ -354,7 +354,7 @@
  
--        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 @@
+         if (show_message_dialog && !eject && val == TRUE && exit_status == 0)
+             xfce_dialog_show_info (NULL, NULL, _("The device \"%s\" should be removable safely now."), pdisk->device);
+-        if (show_message_dialog && disk_check_mounted(pdisk->device))
++        if (show_message_dialog && (disk_check_mounted(pdisk->device) || disk_check_mounted(pdisk->mount_point)))
+             xfce_dialog_show_error (NULL, NULL, _("An error occurred. The device \"%s\" should not be removed!"), pdisk->device);
+     }
+ }
+@@ -400,7 +400,7 @@
      for (pfstab = getfsent(); pfstab!=NULL; pfstab = getfsent())
      {
          has_valid_mount_device =

================================================================
Index: packages/xfce4-mount-plugin/xfce4-mount-plugin.spec
diff -u packages/xfce4-mount-plugin/xfce4-mount-plugin.spec:1.22 packages/xfce4-mount-plugin/xfce4-mount-plugin.spec:1.23
--- packages/xfce4-mount-plugin/xfce4-mount-plugin.spec:1.22	Thu Mar  3 20:45:38 2011
+++ packages/xfce4-mount-plugin/xfce4-mount-plugin.spec	Thu May 17 21:54:24 2012
@@ -2,14 +2,13 @@
 Summary:	mount/umount utility for Xfce panel
 Summary(pl.UTF-8):	Narzędzie do montowania/odmontowywania dla panelu Xfce
 Name:		xfce4-mount-plugin
-Version:	0.5.5
-Release:	6
+Version:	0.6.4
+Release:	1
 License:	GPL v2+
 Group:		X11/Applications
-Source0:	http://archive.xfce.org/src/panel-plugins/xfce4-mount-plugin/0.5/%{name}-%{version}.tar.bz2
-# Source0-md5:	1d237468fe23e4e8c29195d9b99c4c5d
+Source0:	http://archive.xfce.org/src/panel-plugins/xfce4-mount-plugin/0.6/%{name}-%{version}.tar.bz2
+# Source0-md5:	f5917e9aa2a06bc6a872cc10d2ee4f6f
 Patch0:		%{name}-label-uuid.patch
-Patch1:		%{name}-ui.patch
 Patch2:		%{name}-position.patch
 URL:		http://goodies.xfce.org/projects/panel-plugins/xfce4-mount-plugin
 BuildRequires:	autoconf >= 2.63
@@ -21,11 +20,11 @@
 BuildRequires:	perl-XML-Parser
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.601
-BuildRequires:	xfce4-dev-tools >= 4.4.0
-BuildRequires:	xfce4-panel-devel >= 4.4.0
+BuildRequires:	xfce4-dev-tools >= 4.10.0
+BuildRequires:	xfce4-panel-devel >= 4.10.0
 Requires:	gtk-update-icon-cache
 Requires:	hicolor-icon-theme
-Requires:	xfce4-panel >= 4.4.0
+Requires:	xfce4-panel >= 4.10.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -39,8 +38,8 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
+# verify if needed
+#%patch2 -p1
 
 %build
 %{__intltoolize}
@@ -59,9 +58,6 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-mv $RPM_BUILD_ROOT%{_datadir}/locale/nb{_NO,}
-mv $RPM_BUILD_ROOT%{_datadir}/locale/pt{_PT,}
-
 %find_lang %{name}
 
 %clean
@@ -76,8 +72,8 @@
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog README TODO
-%attr(755,root,root) %{_libdir}/xfce4/panel-plugins/xfce4-mount-plugin
-%{_datadir}/xfce4/panel-plugins/xfce4-mount-plugin.desktop
+#%attr(755,root,root) %{_libdir}/xfce4/panel-plugins/xfce4-mount-plugin
+#%{_datadir}/xfce4/panel-plugins/xfce4-mount-plugin.desktop
 %{_iconsdir}/hicolor/*/apps/*.*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -86,6 +82,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.23  2012/05/17 19:54:24  baggins
+- updated to 0.6.4
+
 Revision 1.22  2011/03/03 19:45:38  baggins
 - rel 6
 - properly position menu under plugin icon
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/xfce4-mount-plugin/xfce4-mount-plugin-label-uuid.patch?r1=1.1&r2=1.2
    http://cvs.pld-linux.org/packages/xfce4-mount-plugin/xfce4-mount-plugin.spec?r1=1.22&r2=1.23