rpms/k3b/F-7 k3b-1.0.3-umount.patch, NONE, 1.1 k3b.spec, 1.42, 1.43 sources, 1.17, 1.18

[Harald Hoyer (harald)]

Author: harald

Update of /cvs/pkgs/rpms/k3b/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6911

Modified Files:
	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: k3b.spec
===================================================================
RCS file: /cvs/pkgs/rpms/k3b/F-7/k3b.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- k3b.spec	20 Jun 2007 10:46:19 -0000	1.42
+++ k3b.spec	30 Jul 2007 08:00:25 -0000	1.43
@@ -1,5 +1,3 @@
-%define tar_version 1.0.1
-%define i18n_version 1.0.1
 
 ## distro/release specific support
 %if 0%{?fedora} > 4 || 0%{?rhel} > 4
@@ -9,22 +7,21 @@
 Name:    k3b
 Summary: CD/DVD burning application for KDE
 Epoch:   0
-Version: 1.0.1
-Release: 1%{?dist}.2
+Version: 1.0.3
+Release: 1%{?dist}
 
 Group:   Applications/Archiving
 License: GPL
 URL:     http://www.k3b.org
-Source0: http://dl.sf.net/k3b/k3b-%{tar_version}.tar.bz2
-Source1: http://dl.sf.net/k3b/k3b-i18n-%{i18n_version}.tar.bz2
+Source0: http://dl.sf.net/k3b/k3b-%{version}.tar.bz2
+Source1: http://dl.sf.net/k3b/k3b-i18n-%{version}.tar.bz2
 Source2: k3brc
 
 Patch1: k3b-i18n-0.12.17-rellink.patch
-# See http://bugzilla.redhat.com/244513
-Patch2: k3b-1.0.1-hidden.patch
+Patch2: k3b-1.0.3-umount.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
+# TODO: bugzilla/document
 ExcludeArch: s390 s390x
 
 BuildRequires: kdelibs-devel 
@@ -74,17 +71,16 @@
 
 
 %prep
-%setup -q -a 1 -n %{name}-%{tar_version}
+%setup -q -a 1 -n %{name}-%{version}
 
-pushd %{name}-i18n-%{i18n_version}
+pushd %{name}-i18n-%{version}
 %patch1 -p2 -b .lns
 #aclocal
 #autoconf
 make -f admin/Makefile.common
 popd
 
-%patch2 -p1 -b .hidden
-make -f admin/Makefile.common
+%patch2 -p1 -b .umount
 
 
 %build
@@ -97,6 +93,7 @@
   --disable-debug --disable-warnings \
   --disable-dependency-tracking --enable-final \
   --with-k3bsetup=no \
+  --without-cdrecord-suid-root \
   --with-oggvorbis \
   --with-flac \
   --with-external-libsamplerate \
@@ -109,7 +106,7 @@
 make %{?_smp_mflags}
 
 # Build for i18n tarball
-pushd %{name}-i18n-%{i18n_version}
+pushd %{name}-i18n-%{version}
 %configure
 make %{?_smp_mflags}
 popd
@@ -120,7 +117,7 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # Install for i18n tarball
-pushd %{name}-i18n-%{i18n_version}
+pushd %{name}-i18n-%{version}
 make install DESTDIR=$RPM_BUILD_ROOT
 popd
 
@@ -175,6 +172,7 @@
 %doc AUTHORS README COPYING TODO ChangeLog
 %{_bindir}/k3b
 %{_datadir}/applications/kde/*.desktop
+%{_datadir}/applnk/.hidden/*.desktop
 %{_datadir}/mimelnk/application/x-k3b.desktop
 %{_libdir}/libk3b*.so.*
 
@@ -210,21 +208,25 @@
 # devel subpackage
 %files devel
 %defattr(-,root,root,755)
-%doc %{name}-i18n-%{i18n_version}/README 
-%doc %{name}-i18n-%{i18n_version}/COPYING 
+%doc %{name}-i18n-%{version}/README 
+%doc %{name}-i18n-%{version}/COPYING 
 %{_includedir}/k3b/
 %{_libdir}/libk3b*.so
 
 
 %changelog
-* Wed Jun 20 2007 Harald Hoyer <harald at redhat.com> - 0:1.0.1-1.2
-- k3b-1.0.1-1.2 update release for F-7
+* 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
 
-* Sat Jun 16 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 0:1.0.1-1.2
-- k3b-iso.desktop,k3b-cue.desktop: +NoDisplay=true (#244513)
+* Sat Jun 16 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 0:1.0.1-4
+- k3b-iso.desktop,k3b-cue.desktop: +NoDisplay=True (#244513)
 
-* Thu Jun  7 2007 Harald Hoyer <harald at redhat.com> - 0:1.0.1-1
-- k3b-1.0.1 update release for F-7
+* Wed Jun 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 0:1.0.1-3
+- --without-cdrecord-suid-root
 
 * Wed Jun 06 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 0:1.0.1-2
 - respin (for libmpcdec)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/k3b/F-7/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	7 Jun 2007 14:05:05 -0000	1.17
+++ sources	30 Jul 2007 08:00:25 -0000	1.18
@@ -1,2 +1,2 @@
-8abd11f56e6e40d6f2d0b076a5f8b8ed  k3b-1.0.1.tar.bz2
-f87a27408a4153d860103816ba83db09  k3b-i18n-1.0.1.tar.bz2
+ca9b761045cac9aeccdf1b941a310996  k3b-1.0.3.tar.bz2
+d4c73557e045c3ade04e7fecd63923a0  k3b-i18n-1.0.3.tar.bz2