rpms/k3b/devel k3b-1.0.3-umount.patch, NONE, 1.1 .cvsignore, 1.17, 1.18 k3b.spec, 1.45, 1.46 sources, 1.18, 1.19

[Harald Hoyer (harald)]

Author: harald

Update of /cvs/pkgs/rpms/k3b/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3098

Modified Files:
	.cvsignore k3b.spec sources 
Added Files:
	k3b-1.0.3-umount.patch 
Log Message:
- version 1.0.3
- added gnome-umount patch


k3b-1.0.3-umount.patch:

--- NEW FILE k3b-1.0.3-umount.patch ---
--- k3b-1.0.3/libk3b/core/k3bglobals.cpp.umount	2007-07-27 21:26:30.000000000 +0200
+++ k3b-1.0.3/libk3b/core/k3bglobals.cpp	2007-07-27 21:31:26.000000000 +0200
@@ -569,7 +569,22 @@
       return true;
   }
 
-  // now try pmount
+#ifdef HAVE_HAL
+    if (!K3bDevice::HalConnection::instance()->unmount( dev ))
+      return true;
+#endif
+
+  QString gumountBin = K3b::findExe( "gnome-umount" );
+  if( !gumountBin.isEmpty() ) {
+    KProcess p;
+    p << gumountBin;
+    p << dev->blockDeviceName();
+    p.start( KProcess::Block );
+    if( !p.exitStatus() )
+      return true;
+  }
+  
+// now try pmount
   QString pumountBin = K3b::findExe( "pumount" );
   if( !pumountBin.isEmpty() ) {
     KProcess p;
@@ -577,15 +592,11 @@
     p << "-l"; // lazy unmount
     p << dev->blockDeviceName();
     p.start( KProcess::Block );
-    return !p.exitStatus();
-  }
-  else {
-#ifdef HAVE_HAL
-    return !K3bDevice::HalConnection::instance()->unmount( dev );
-#else
-    return false;
-#endif
+    if( !p.exitStatus() )
+      return true;
   }
+
+  return false;
 }
 
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/k3b/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	25 Jun 2007 03:27:10 -0000	1.17
+++ .cvsignore	27 Jul 2007 20:03:41 -0000	1.18
@@ -1,6 +1,2 @@
-k3b-1.0.tar.bz2
-k3b-i18n-1.0.tar.bz2
-k3b-1.0.1.tar.bz2
-k3b-i18n-1.0.1.tar.bz2
-k3b-1.0.2.tar.bz2
-k3b-i18n-1.0.2.tar.bz2
+k3b-1.0.3.tar.bz2
+k3b-i18n-1.0.3.tar.bz2


Index: k3b.spec
===================================================================
RCS file: /cvs/pkgs/rpms/k3b/devel/k3b.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- k3b.spec	25 Jun 2007 03:27:10 -0000	1.45
+++ k3b.spec	27 Jul 2007 20:03:41 -0000	1.46
@@ -7,7 +7,7 @@
 Name:    k3b
 Summary: CD/DVD burning application for KDE
 Epoch:   0
-Version: 1.0.2
+Version: 1.0.3
 Release: 1%{?dist}
 
 Group:   Applications/Archiving
@@ -18,6 +18,7 @@
 Source2: k3brc
 
 Patch1: k3b-i18n-0.12.17-rellink.patch
+Patch2: k3b-1.0.3-umount.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # TODO: bugzilla/document
@@ -79,6 +80,8 @@
 make -f admin/Makefile.common
 popd
 
+%patch2 -p1 -b .umount
+
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -212,6 +215,10 @@
 
 
 %changelog
+* Fri Jul 27 2007 Harald Hoyer <harald at redhat.com> - 0:1.0.3-1
+- version 1.0.3
+- added gnome-umount patch
+
 * Sat Jun 23 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 0:1.0.2-1
 - k3b-1.0.2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/k3b/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	25 Jun 2007 03:27:10 -0000	1.18
+++ sources	27 Jul 2007 20:03:41 -0000	1.19
@@ -1,2 +1,2 @@
-b9307b3de0d15880a57c23a007bffca4  k3b-1.0.2.tar.bz2
-3c9b3e76e7781f15b1373f2f5c1dc0b3  k3b-i18n-1.0.2.tar.bz2
+ca9b761045cac9aeccdf1b941a310996  k3b-1.0.3.tar.bz2
+d4c73557e045c3ade04e7fecd63923a0  k3b-i18n-1.0.3.tar.bz2