rpms/k3b/F-9 k3b-1.0.5-desktopfile.patch, NONE, 1.1 k3b-1.0.5-kde#156684.patch, NONE, 1.1 reload-for-verification.diff, NONE, 1.1 k3b-1.0.5-hidden.patch, 1.1, 1.2 k3b.spec, 1.59, 1.60 k3b-i18n-0.12.17-rellink.patch, 1.1, NONE

Sun Jun 14 04:28:51 UTC 2009

Author: rdieter

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

Modified Files:
	k3b-1.0.5-hidden.patch k3b.spec 
Added Files:
	k3b-1.0.5-desktopfile.patch k3b-1.0.5-kde#156684.patch 
	reload-for-verification.diff 
Removed Files:
	k3b-i18n-0.12.17-rellink.patch 
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


k3b-1.0.5-desktopfile.patch:

--- NEW FILE k3b-1.0.5-desktopfile.patch ---
diff -up k3b-1.0.5/src/k3b.desktop.dt k3b-1.0.5/src/k3b.desktop
--- k3b-1.0.5/src/k3b.desktop.dt	2008-05-27 03:24:04.000000000 -0500
+++ k3b-1.0.5/src/k3b.desktop	2009-06-13 23:12:17.077063401 -0500
@@ -117,8 +117,8 @@ Name=K3b
 Name[ar]= K3b
 Name[bn]=à¦•à§‡-à¦¥à§à¦°à¦¿-à¦¬à¦¿
 Name[hi]=à¤•à¥‡3à¤¬à¥€
-MimeType=application/x-k3b
+MimeType=application/x-k3b;
 X-KDE-StartupNotify=true
-X-KDE-NativeMimeType=application/x-k3b;application/x-iso
+X-KDE-NativeMimeType=application/x-k3b;application/x-iso;
 Categories=KDE;Application;AudioVideo;DiscBurning;
 X-DCOP-ServiceType=Unique

k3b-1.0.5-kde#156684.patch:

--- NEW FILE k3b-1.0.5-kde#156684.patch ---
diff -up k3b-1.0.5/libk3b/projects/k3bcdrecordwriter.cpp.kde#156684 k3b-1.0.5/libk3b/projects/k3bcdrecordwriter.cpp
--- k3b-1.0.5/libk3b/projects/k3bcdrecordwriter.cpp.kde#156684	2008-05-27 03:24:19.000000000 -0500
+++ k3b-1.0.5/libk3b/projects/k3bcdrecordwriter.cpp	2008-07-31 08:17:39.000000000 -0500
@@ -243,9 +243,11 @@ void K3bCdrecordWriter::prepareProcess()
     *m_process << "textfile=" + d->cdTextFile->name();
   }
 
+#if 0
   if( k3bcore->globalSettings()->ejectMedia() &&
       !m_forceNoEject )
     *m_process << "-eject";
+#endif
 
   bool manualBufferSize = k3bcore->globalSettings()->useManualBufferSize();
   if( manualBufferSize ) {

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 );

k3b-1.0.5-hidden.patch:

Index: k3b-1.0.5-hidden.patch
===================================================================
RCS file: /cvs/pkgs/rpms/k3b/F-9/k3b-1.0.5-hidden.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- k3b-1.0.5-hidden.patch	30 Jun 2008 15:20:55 -0000	1.1
+++ k3b-1.0.5-hidden.patch	14 Jun 2009 04:28:49 -0000	1.2
@@ -1,7 +1,7 @@
 diff -up k3b-1.0.5/src/Makefile.in.hidden k3b-1.0.5/src/Makefile.in
 --- k3b-1.0.5/src/Makefile.in.hidden	2008-05-27 03:34:44.000000000 -0500
-+++ k3b-1.0.5/src/Makefile.in	2008-06-30 09:30:46.000000000 -0500
-@@ -512,9 +512,7 @@ k3b_LDADD = ./option/liboption.la ./rip/
++++ k3b-1.0.5/src/Makefile.in	2008-08-27 14:18:54.000000000 -0500
+@@ -512,9 +512,9 @@ k3b_LDADD = ./option/liboption.la ./rip/
  	-lkio -lkparts $(CAM_LIB) $(MUSICBRAINZ_LIBS)
  
  SUBDIRS = option misc rip projects fastscale pics icons konqi mimetypes sounds
@@ -9,12 +9,14 @@ diff -up k3b-1.0.5/src/Makefile.in.hidde
 -silent_DATA = k3b-iso.desktop k3b-cue.desktop
 -silentdir = $(kde_appsdir)/.hidden/
 +xdg_apps_DATA = k3b.desktop k3b-iso.desktop k3b-cue.desktop
++#silent_DATA = k3b-iso.desktop k3b-cue.desktop
++#silentdir = $(kde_appsdir)/.hidden/
  
  ###################
  # this 10 paths are KDE specific. Use them:
 diff -up k3b-1.0.5/src/Makefile.am.hidden k3b-1.0.5/src/Makefile.am
 --- k3b-1.0.5/src/Makefile.am.hidden	2008-05-27 03:24:04.000000000 -0500
-+++ k3b-1.0.5/src/Makefile.am	2008-06-30 09:29:58.000000000 -0500
++++ k3b-1.0.5/src/Makefile.am	2008-08-27 14:13:36.000000000 -0500
 @@ -32,10 +32,7 @@ k3b_LDADD = ./option/liboption.la ./rip/
  
  SUBDIRS = option misc rip projects fastscale pics icons konqi mimetypes sounds


Index: k3b.spec
===================================================================
RCS file: /cvs/pkgs/rpms/k3b/F-9/k3b.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -p -r1.59 -r1.60
--- k3b.spec	30 Jun 2008 15:20:55 -0000	1.59
+++ k3b.spec	14 Jun 2009 04:28:49 -0000	1.60
@@ -4,41 +4,61 @@
 %define _with_hal --with-hal
 %endif
 
-%if 0%{?fedora} > 8
-# include -devel subpkg or not? 1=yes
+%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
+
+%if 0%{?fedora} > 9
+# -libs subpkg
+%define libs 1
 %endif
 
+# build/include i18n
+%define i18n 1
+
 Name:    k3b
-Summary: CD/DVD burning application for KDE
+Summary: CD/DVD burning application
 Epoch:   0
 Version: 1.0.5
-Release: 3%{?dist}
+Release: 9%{?dist}
 
 Group:   Applications/Archiving
 License: GPLv2+
 URL:     http://www.k3b.org
 Source0: http://downloads.sf.net/k3b/k3b-%{version}.tar.bz2
-Source1: http://downloads.sf.net/k3b/k3b-i18n-%{version}.tar.bz2
+%{?i18n:Source1: http://downloads.sf.net/k3b/k3b-i18n-%{version}.tar.bz2}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # TODO: bugzilla/document
 ExcludeArch: s390 s390x
 
 Source2: k3brc
 
-Patch1: k3b-i18n-0.12.17-rellink.patch
 Patch2: k3b-1.0.3-umount.patch
-# http://bugs.kde.org/151816 , k3b can't reload media for verification
-Patch3: k3b-1.0.4-kde#151816.patch
+# manual bufsize (upstream?)
 Patch4: k3b-1.0.4-manualbufsize.patch
+
+# upstreamable patches
+Patch50: k3b-1.0.5-desktopfile.patch
+
+# upstream patches
+# http://bugs.kde.org/151816 , k3b can't reload media for verification
+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
-Patch5: k3b-1.0.5-hidden.patch
+# upstreamed 2008-08-27
+Patch105: k3b-1.0.5-hidden.patch
 
-BuildRequires: kdelibs3-devel 
+BuildRequires: %{kdelibs3}-devel
 BuildRequires: desktop-file-utils
-# needed by patch1
-BuildRequires: automake libtool
 BuildRequires: alsa-lib-devel
 BuildRequires: audiofile-devel
 %{?_with_hal:BuildRequires: dbus-qt-devel hal-devel}
@@ -55,16 +75,28 @@ BuildRequires: zlib-devel
 
 Obsoletes: k3b-extras < %{epoch}:%{version}-%{release}
 Provides:  k3b-extras = %{epoch}:%{version}-%{release} 
+%if 0%{?i18n}
 # imo, should be packaged separately, tis a shame to duplicate all 
 # this noarch build/data on *every* arch.  -- Rex
 Obsoletes: %{name}-i18n < %{epoch}:%{version}-%{release}
 Provides: %{name}-i18n = %{epoch}:%{version}-%{release}
+%endif
 %if ! 0%{?devel}
 Obsoletes: %{name}-devel < %{epoch}:%{version}-%{release}
 %endif
 
-Requires(post): /sbin/ldconfig coreutils
-Requires(postun): /sbin/ldconfig coreutils
+Requires(post): coreutils
+Requires(postun): coreutils
+
+%if 0%{?libs}
+Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+%else
+#Obsoletes: %{name}-libs < %{epoch}:%{version}-%{release}
+Provides:  %{name}-libs = %{epoch}:%{version}-%{release}
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+%endif
+
 Requires: cdrecord mkisofs
 %if 0%{?fedora} > 3
 Requires(hint): cdrdao
@@ -79,31 +111,35 @@ steps of the burning process the beginne
 automatic settings and the reasonable k3b defaults which allow a quick
 start.
 
-%if 0%{?devel}
-# afaik, nobody BR's it, and it pulls k3b into multilib.
-# when/if this is ever needed, consider -libs subpkg -- Rex
+%package libs
+Summary: Runtime libraries for %{name}
+Group:   System Environment/Libraries
+# be paranoid -- Rex
+Requires: %{name} = %{epoch}:%{version}-%{release}
+%description libs
+%{summary}.
+
 %package devel
 Summary: Files for the development of applications which will use %{name} 
 Group: Development/Libraries
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name}-libs = %{epoch}:%{version}-%{release}
 %description devel
 %{summary}.
-%endif
 
 
 %prep
-%setup -q -a 1 -n %{name}-%{version}
+%setup -q %{?i18n:-a 1} -n %{name}-%{version}
 
 %patch2 -p1 -b .umount
-%patch3 -p1 -b .kde#151816
-# set in k3brc instead
-#patch4 -p1 -b .manualbufsize
-%patch5 -p1 -b .hidden
+# set in k3brc too 
+%patch4 -p1 -b .manualbufsize
 
-pushd %{name}-i18n-%{version}
-%patch1 -p2 -b .lns
-make -f admin/Makefile.common
-popd
+%patch50 -p1 -b .desktopfile
+
+#patch100 -p1 -b .kde#151816
+#patch101 -p1 -b .kde#156684
+%patch102 -p0 -b .kde#156684
+%patch105 -p1 -b .hidden
 
 
 %build
@@ -120,6 +156,7 @@ unset QTDIR || : ; . /etc/profile.d/qt.s
   --with-oggvorbis \
   --with-flac \
   --with-external-libsamplerate \
+  --with-libdvdread \
   --with-musicbrainz \
   --with-sndfile \
   --without-ffmpeg --without-lame --without-libmad \
@@ -128,81 +165,104 @@ unset QTDIR || : ; . /etc/profile.d/qt.s
 
 make %{?_smp_mflags}
 
+%if 0%{?i18n}
 # Build for i18n tarball
 pushd %{name}-i18n-%{version}
 %configure
 make %{?_smp_mflags}
 popd
+%endif
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-
-# Install for i18n tarball
-pushd %{name}-i18n-%{version}
-make install DESTDIR=$RPM_BUILD_ROOT
-popd
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
 
-%{__install} -D -m 644 -p %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/config/k3brc
+%if 0%{?i18n}
+make install DESTDIR=%{buildroot} -C %{name}-i18n-%{version}
+%endif
 
-desktop-file-install --vendor="" \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
-  $RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop
+%{__install} -D -m 644 -p %{SOURCE2} %{buildroot}%{_datadir}/config/k3brc
 
 # remove the .la files
-rm -f $RPM_BUILD_ROOT%{_libdir}/libk3b*.la 
+rm -f %{buildroot}%{_libdir}/libk3b*.la 
 
 # remove i18n for Plattdeutsch (Low Saxon)
-rm -fr $RPM_BUILD_ROOT%{_datadir}/locale/nds
+rm -fr %{buildroot}%{_datadir}/locale/nds
 
-rm -f $RPM_BUILD_ROOT%{_docdir}/HTML/en/k3b/common 
-ln -s ../common $RPM_BUILD_ROOT%{_docdir}/HTML/en/k3b/common
-
-pushd $RPM_BUILD_ROOT%{_datadir}/doc/HTML
-for i in *; do
-	test -d $i && mkdir $i/common 2>/dev/null
+# HTML (1.0)
+HTML_DIR=$(kde-config --expandvars --install html)
+if [ -d %{buildroot}$HTML_DIR ]; then
+for lang_dir in %{buildroot}$HTML_DIR/* ; do
+  if [ -d $lang_dir ]; then
+    lang=$(basename $lang_dir)
+    echo "%lang($lang) $HTML_DIR/$lang/*" >> all.lang
+    # replace absolute symlinks with relative ones
+    pushd $lang_dir
+      for i in *; do
+        [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
+      done
+    popd
+  fi
 done
-popd
+fi
 
+%if 0%{?i18n}
 %find_lang k3b
 %find_lang k3bsetup
 %find_lang libk3b
 %find_lang libk3bdevice
-
 cat k3b.lang k3bsetup.lang libk3b.lang libk3bdevice.lang >> all.lang
+%endif
 
 # unpackaged files
 %if ! 0%{?devel}
-rm -rf $RPM_BUILD_ROOT%{_includedir}/k3b/
-rm -f  $RPM_BUILD_ROOT%{_libdir}/libk3b*.so
+rm -rf %{buildroot}%{_includedir}/k3b/
+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 $RPM_BUILD_ROOT
+rm -rf %{buildroot}
+
+
+%if 0%{?libs}
+%post libs -p /sbin/ldconfig
 
+%postun libs -p /sbin/ldconfig
+%endif
 
 %post
-/sbin/ldconfig
+%{?!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
-/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 ||:
+%{?!libs:/sbin/ldconfig}
+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}/libk3b*.so.*
 
 %{_libdir}/kde3/*.so
 %{_libdir}/kde3/*.la
@@ -216,21 +276,11 @@ update-desktop-database %{_datadir}/appl
 %{_datadir}/sounds/*
 %{_datadir}/icons/hicolor/*/*/*
 
-# files from i18n
-%lang(da) %{_docdir}/HTML/da/%{name}/*
-%lang(de) %{_docdir}/HTML/de/%{name}/*
-%lang(en) %{_docdir}/HTML/en/%{name}/*
-%lang(es) %{_docdir}/HTML/es/%{name}/*
-%lang(et) %{_docdir}/HTML/et/%{name}/*
-%lang(fr) %{_docdir}/HTML/fr/%{name}/*
-%lang(it) %{_docdir}/HTML/it/%{name}/*
-%lang(nl) %{_docdir}/HTML/nl/%{name}/*
-%lang(pt) %{_docdir}/HTML/pt/%{name}/*
-%lang(pt_BR) %{_docdir}/HTML/pt_BR/%{name}/*
-%lang(ru) %{_docdir}/HTML/ru/%{name}/*
-%lang(sv) %{_docdir}/HTML/sv/%{name}/*
-%lang(uk) %{_docdir}/HTML/uk/%{name}/*
-%lang(pl) %{_docdir}/HTML/pl/%{name}/*
+%if 0%{?libs}
+%files libs
+%defattr(-,root,root,-)
+%endif
+%{_libdir}/libk3b*.so.*
 
 %if 0%{?devel}
 %files devel
@@ -241,6 +291,30 @@ 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
+
+* Wed Aug 27 2008 Rex Dieter <rdieter at fedoraproject.org> - 0:1.0.5-5
+- resurrect -devel (!=f9), grow -libs (f10+, #341651)
+- avoid auto*foo
+- fix build on rawhide (libdvdread header changes)
+- conditionalize i18n bits
+
+* Thu Jul 31 2008 Rex Dieter <rdieter at fedoraproject.org> - 0:1.0.5-4
+- try alternative fix for tray eject/reload (kde#156684)
+
 * Mon Jun 30 2008 Rex Dieter <rdieter at fedoraproject.org> - 0:1.0.5-3
 - No association k3b with .iso files in gnome (#419681)
 - scriptlet deps


--- k3b-i18n-0.12.17-rellink.patch DELETED ---


