rpms/k3b/F-10 reload-for-verification.diff, NONE, 1.1 k3b.spec, 1.66, 1.67

Sun Jun 14 04:07:51 UTC 2009

Author: rdieter

Update of /cvs/pkgs/rpms/k3b/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11653

Modified Files:
	k3b.spec 
Added Files:
	reload-for-verification.diff 
Log Message:
* Sat Jun 13 2009 Rex Dieter <rdieter at fedoraproject.org> - 0:1.0.5-9
- another try at a reload patch that works (kde#156684#c30)
- optimize scriptlets


reload-for-verification.diff:

--- NEW FILE reload-for-verification.diff ---
--- libk3b/jobs/k3bverificationjob.cpp.sav	2008-05-27 10:24:20.000000000 +0200
+++ libk3b/jobs/k3bverificationjob.cpp	2009-06-11 17:58:58.000000000 +0200
@@ -154,6 +154,20 @@ void K3bVerificationJob::start()
   emit newTask( i18n("Checking medium") );
 
   d->mediumHasBeenReloaded = false;
+  connect( K3bDevice::sendCommand( K3bDevice::DeviceHandler::LOAD, d->device ),
+           SIGNAL(finished(K3bDevice::DeviceHandler*)),
+           this,
+           SLOT(slotMediaLoaded()) );
+}
+
+void K3bVerificationJob::slotMediaLoaded()
+{
+    // we always need to wait for the medium. Otherwise the diskinfo below
+    // may run before the drive is ready!
+    waitForMedia( d->device,
+                  K3bDevice::STATE_COMPLETE|K3bDevice::STATE_INCOMPLETE,
+                  K3bDevice::MEDIA_WRITABLE );
+
   connect( K3bDevice::sendCommand( K3bDevice::DeviceHandler::DISKINFO, d->device ),
            SIGNAL(finished(K3bDevice::DeviceHandler*)),
            this,
--- libk3b/jobs/k3bverificationjob.h.sav	2008-05-27 10:24:20.000000000 +0200
+++ libk3b/jobs/k3bverificationjob.h	2009-06-11 17:13:37.000000000 +0200
@@ -75,6 +75,7 @@ class K3bVerificationJob : public K3bJob
   void setGrownSessionSize( const K3b::Msf& );
 
  private slots:
+  void slotMediaLoaded();
   void slotMediaReloaded( bool success );
   void slotDiskInfoReady( K3bDevice::DeviceHandler* dh );
   void readTrack( int trackIndex );


Index: k3b.spec
===================================================================
RCS file: /cvs/pkgs/rpms/k3b/F-10/k3b.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- k3b.spec	1 Oct 2008 17:07:15 -0000	1.66
+++ k3b.spec	14 Jun 2009 04:07:20 -0000	1.67
@@ -4,6 +4,13 @@
 %define _with_hal --with-hal
 %endif
 
+%if 0%{?fedora} > 6
+%define kdelibs3 kdelibs3
+%else
+%define kdelibs3 kdelibs
+BuildRequires: libutempter-devel
+%endif
+
 # include -devel subpkg or not? 1=yes
 %define devel 1
 
@@ -16,10 +23,10 @@
 %define i18n 1
 
 Name:    k3b
-Summary: CD/DVD burning application for KDE
+Summary: CD/DVD burning application
 Epoch:   0
 Version: 1.0.5
-Release: 6%{?dist}
+Release: 9%{?dist}
 
 Group:   Applications/Archiving
 License: GPLv2+
@@ -41,11 +48,13 @@ Patch4: k3b-1.0.4-manualbufsize.patch
 Patch100: k3b-1.0.4-kde#151816.patch
 # http://bugs.kde.org/156684 , alternative to patch100
 Patch101: k3b-1.0.5-kde#156684.patch
+# 3rd time is a charm, https://bugs.kde.org/show_bug.cgi?id=156684#c30 
+Patch102: reload-for-verification.diff
 # put k3b-(iso,cue).desktop to xdg_apps_DATA , see http://bugzilla.redhat.com/419681
 # upstreamed 2008-08-27
 Patch105: k3b-1.0.5-hidden.patch
 
-BuildRequires: kdelibs3-devel 
+BuildRequires: %{kdelibs3}-devel
 BuildRequires: desktop-file-utils
 BuildRequires: alsa-lib-devel
 BuildRequires: audiofile-devel
@@ -123,7 +132,8 @@ Requires: %{name}-libs = %{epoch}:%{vers
 %patch4 -p1 -b .manualbufsize
 
 #patch100 -p1 -b .kde#151816
-%patch101 -p1 -b .kde#156684
+#patch101 -p1 -b .kde#156684
+%patch102 -p0 -b .kde#156684
 %patch105 -p1 -b .hidden
 
 
@@ -164,18 +174,11 @@ rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 
 %if 0%{?i18n}
-# Install for i18n tarball
-pushd %{name}-i18n-%{version}
-make install DESTDIR=%{buildroot}
-popd
+make install DESTDIR=%{buildroot} -C %{name}-i18n-%{version}
 %endif
 
 %{__install} -D -m 644 -p %{SOURCE2} %{buildroot}%{_datadir}/config/k3brc
 
-desktop-file-install --vendor="" \
-  --dir %{buildroot}%{_datadir}/applications/kde \
-  %{buildroot}%{_datadir}/applications/kde/*.desktop
-
 # remove the .la files
 rm -f %{buildroot}%{_libdir}/libk3b*.la 
 
@@ -214,6 +217,12 @@ rm -f  %{buildroot}%{_libdir}/libk3b*.so
 %endif
 
 
+%check
+desktop-file-validate %{buildroot}%{_datadir}/applications/kde/k3b-cue.desktop
+desktop-file-validate %{buildroot}%{_datadir}/applications/kde/k3b-iso.desktop
+desktop-file-validate %{buildroot}%{_datadir}/applications/kde/k3b.desktop
+
+
 %clean
 rm -rf %{buildroot}
 
@@ -227,21 +236,27 @@ rm -rf %{buildroot}
 %post
 %{?!libs:/sbin/ldconfig}
 touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 ||:
 
 %postun
 %{?!libs:/sbin/ldconfig}
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 ||:
+if [ $1 -eq 0 ] ; then
+  update-desktop-database -q &> /dev/null
+  touch --no-create %{_datadir}/icons/hicolor &> /dev/null
+  gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+fi
+
+%posttrans
+update-desktop-database -q &> /dev/null
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 
 
 %files -f all.lang
 %defattr(-,root,root,755)
 %doc AUTHORS README COPYING TODO ChangeLog
 %{_bindir}/k3b
-%{_datadir}/applications/kde/*.desktop
+%{_datadir}/applications/kde/k3b-cue.desktop
+%{_datadir}/applications/kde/k3b-iso.desktop
+%{_datadir}/applications/kde/k3b.desktop
 %{_datadir}/mimelnk/application/x-k3b.desktop
 
 %{_libdir}/kde3/*.so
@@ -271,6 +286,17 @@ update-desktop-database %{_datadir}/appl
 
 
 %changelog
+* Sat Jun 13 2009 Rex Dieter <rdieter at fedoraproject.org> - 0:1.0.5-9
+- another try at a reload patch that works (kde#156684#c30)
+- optimize scriptlets
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.0.5-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Wed Jan 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 0:1.0.5-7
+- Summary: omit "for KDE"
+- add rhel portability to .spec
+
 * Wed Oct 01 2008 Rex Dieter <rdieter at fedoraproject.org> - 0:1.0.5-6
 - revert libdvdread header changes, fix build (#465115)
 - (re)enable -devel on f9


