rpms/k3b/F-12 k3b-1.0.3-umount.patch, 1.3, 1.4 k3b-1.0.4-kde#151816.patch, 1.2, 1.3 k3b-1.0.4-manualbufsize.patch, 1.2, 1.3 k3b-1.0.5-desktopfile.patch, NONE, 1.1 k3b-1.0.5-hidden.patch, 1.4, 1.5 k3b-1.0.5-kde#156684.patch, 1.2, 1.3 k3brc, 1.3, 1.4 reload-for-verification.diff, NONE, 1.1 .cvsignore, 1.22, 1.23 k3b.spec, 1.76, 1.77 sources, 1.23, 1.24
Rex Dieter
rdieter at fedoraproject.org
Sat Sep 26 18:03:02 UTC 2009
- Previous message (by thread): rpms/kernel/F-11 kvm-guest-fix-bogus-wallclock-physical-address-calculation.patch, NONE, 1.1 kvm-mmu-make-__kvm_mmu_free_some_pages-handle-empty-list.patch, NONE, 1.1 kvm-vmx-check-cpl-before-emulating-debug-register-access.patch, NONE, 1.1 kvm-vmx-fix-cr8-exiting-control-clobbering-by-ept.patch, NONE, 1.1 kvm-x86-disallow-hypercalls-for-guest-callers-in-rings-0.patch, NONE, 1.1 kernel.spec, 1.1743, 1.1744
- Next message (by thread): rpms/k3b/devel k3b.spec,1.76,1.77
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rdieter
Update of /cvs/pkgs/rpms/k3b/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29656
Modified Files:
.cvsignore k3b.spec sources
Added Files:
k3b-1.0.3-umount.patch k3b-1.0.4-kde#151816.patch
k3b-1.0.4-manualbufsize.patch k3b-1.0.5-desktopfile.patch
k3b-1.0.5-hidden.patch k3b-1.0.5-kde#156684.patch k3brc
reload-for-verification.diff
Log Message:
revert to k3b-1.0.5
* Sat Sep 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:1.0.5-10
- Epoch: 1 (increment Release too, to minimize confusion)
- -common: noarch subpkg
k3b-1.0.3-umount.patch:
k3bglobals.cpp | 31 ++++++++++++++++++++++---------
1 file changed, 22 insertions(+), 9 deletions(-)
Index: k3b-1.0.3-umount.patch
===================================================================
RCS file: k3b-1.0.3-umount.patch
diff -N k3b-1.0.3-umount.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ k3b-1.0.3-umount.patch 26 Sep 2009 18:03:01 -0000 1.4
@@ -0,0 +1,48 @@
+--- 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,24 @@
+ 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 << "-u";
++ p << "-d";
++ 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;
+ }
+
+
k3b-1.0.4-kde#151816.patch:
ChangeLog | 3 --
libk3b/jobs/k3bverificationjob.cpp | 38 ++++++++++++-------------------------
2 files changed, 13 insertions(+), 28 deletions(-)
Index: k3b-1.0.4-kde#151816.patch
===================================================================
RCS file: k3b-1.0.4-kde#151816.patch
diff -N k3b-1.0.4-kde#151816.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ k3b-1.0.4-kde#151816.patch 26 Sep 2009 18:03:01 -0000 1.3
@@ -0,0 +1,90 @@
+diff -ur k3b-1.0.4/ChangeLog k3b-1.0.4-verification-always-reload/ChangeLog
+--- k3b-1.0.4/ChangeLog 2007-11-02 10:55:57.000000000 +0100
++++ k3b-1.0.4-verification-always-reload/ChangeLog 2007-12-07 19:33:18.000000000 +0100
+@@ -4,9 +4,6 @@
+ * Unmount medium before DVD formatting
+ * Silently (without introducing new strings for translation) allow the burning of files
+ bigger than 4 GB with appropriate versions of genisoimage or mkisofs.
+- * Do only reload the medium before verification if necessary, i.e. if the newly written
+- track cannot be read otherwise (many old drives depend on this). Hopefully this will
+- at least work around the aweful "DMA disabled" bug for many users.
+
+ 1.0.3
+ =====
+diff -ur k3b-1.0.4/libk3b/jobs/k3bverificationjob.cpp k3b-1.0.4-verification-always-reload/libk3b/jobs/k3bverificationjob.cpp
+--- k3b-1.0.4/libk3b/jobs/k3bverificationjob.cpp 2007-11-02 10:55:53.000000000 +0100
++++ k3b-1.0.4-verification-always-reload/libk3b/jobs/k3bverificationjob.cpp 2007-07-21 21:53:53.000000000 +0200
+@@ -84,8 +84,6 @@
+ K3bPipe pipe;
+
+ bool readSuccessful;
+-
+- bool mediumHasBeenReloaded;
+ };
+
+
+@@ -151,13 +149,11 @@
+ d->currentTrackIndex = 0;
+ d->alreadyReadSectors = 0;
+
+- emit newTask( i18n("Checking medium") );
++ // first we need to reload and mount the device
++ emit newTask( i18n("Reloading the medium") );
+
+- d->mediumHasBeenReloaded = false;
+- connect( K3bDevice::sendCommand( K3bDevice::DeviceHandler::DISKINFO, d->device ),
+- SIGNAL(finished(K3bDevice::DeviceHandler*)),
+- this,
+- SLOT(slotDiskInfoReady(K3bDevice::DeviceHandler*)) );
++ connect( K3bDevice::reload( d->device ), SIGNAL(finished(bool)),
++ this, SLOT(slotMediaReloaded(bool)) );
+ }
+
+
+@@ -169,8 +165,6 @@
+ K3bDevice::MEDIA_WRITABLE,
+ i18n("Unable to Close the Tray") );
+
+- d->mediumHasBeenReloaded = true;
+-
+ emit newTask( i18n("Checking medium") );
+
+ connect( K3bDevice::sendCommand( K3bDevice::DeviceHandler::DISKINFO, d->device ),
+@@ -191,6 +185,12 @@
+ d->toc = dh->toc();
+ d->totalSectors = 0;
+
++ if ( d->toc.isEmpty() ) {
++ emit infoMessage( i18n( "No tracks to verify found." ), ERROR );
++ jobFinished( false );
++ return;
++ }
++
+ // just to be sure check if we actually have all the tracks
+ int i = 0;
+ for( QValueList<K3bVerificationJobTrackEntry>::iterator it = d->tracks.begin();
+@@ -201,21 +201,9 @@
+ (*it).trackNumber = d->toc.count();
+
+ if( (int)d->toc.count() < (*it).trackNumber ) {
+- if ( d->mediumHasBeenReloaded ) {
+- emit infoMessage( i18n("Internal Error: Verification job improperly initialized (%1)")
+- .arg( "Specified track number not found on medium" ), ERROR );
+- jobFinished( false );
+- return;
+- }
+- else {
+- // many drives need to reload the medium to return to a proper state
+- emit newTask( i18n("Reloading the medium") );
+- connect( K3bDevice::reload( d->device ),
+- SIGNAL(finished(bool)),
+- this,
+- SLOT(slotMediaReloaded(bool)) );
+- return;
+- }
++ emit infoMessage( i18n("Internal Error: Verification job improperly initialized"), ERROR );
++ jobFinished( false );
++ return;
+ }
+
+ d->totalSectors += trackLength( i );
k3b-1.0.4-manualbufsize.patch:
k3bglobalsettings.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Index: k3b-1.0.4-manualbufsize.patch
===================================================================
RCS file: k3b-1.0.4-manualbufsize.patch
diff -N k3b-1.0.4-manualbufsize.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ k3b-1.0.4-manualbufsize.patch 26 Sep 2009 18:03:01 -0000 1.3
@@ -0,0 +1,21 @@
+diff -up k3b-1.0.4/libk3b/core/k3bglobalsettings.cpp.manualbufsize k3b-1.0.4/libk3b/core/k3bglobalsettings.cpp
+--- k3b-1.0.4/libk3b/core/k3bglobalsettings.cpp.manualbufsize 2007-11-02 10:55:39.000000000 +0100
++++ k3b-1.0.4/libk3b/core/k3bglobalsettings.cpp 2008-04-22 14:15:06.000000000 +0200
+@@ -22,7 +22,7 @@ K3bGlobalSettings::K3bGlobalSettings()
+ : m_eject(true),
+ m_burnfree(true),
+ m_overburn(false),
+- m_useManualBufferSize(false),
++ m_useManualBufferSize(true),
+ m_bufferSize(4),
+ m_force(false)
+ {
+@@ -37,7 +37,7 @@ void K3bGlobalSettings::readSettings( KC
+ m_eject = !c->readBoolEntry( "No cd eject", false );
+ m_burnfree = c->readBoolEntry( "burnfree", true );
+ m_overburn = c->readBoolEntry( "Allow overburning", false );
+- m_useManualBufferSize = c->readBoolEntry( "Manual buffer size", false );
++ m_useManualBufferSize = c->readBoolEntry( "Manual buffer size", true );
+ m_bufferSize = c->readNumEntry( "Fifo buffer", 4 );
+ m_force = c->readBoolEntry( "Force unsafe operations", false );
+
k3b-1.0.5-desktopfile.patch:
k3b.desktop | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- 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-hidden.patch:
Makefile.am | 5 +----
Makefile.in | 6 +++---
2 files changed, 4 insertions(+), 7 deletions(-)
Index: k3b-1.0.5-hidden.patch
===================================================================
RCS file: k3b-1.0.5-hidden.patch
diff -N k3b-1.0.5-hidden.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ k3b-1.0.5-hidden.patch 26 Sep 2009 18:03:01 -0000 1.5
@@ -0,0 +1,31 @@
+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-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
+-xdg_apps_DATA = k3b.desktop
+-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-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
+
+-xdg_apps_DATA = k3b.desktop
+-
+-silent_DATA = k3b-iso.desktop k3b-cue.desktop
+-silentdir = $(kde_appsdir)/.hidden/
++xdg_apps_DATA = k3b.desktop k3b-iso.desktop k3b-cue.desktop
+
+ ###################
+ # this 10 paths are KDE specific. Use them:
k3b-1.0.5-kde#156684.patch:
k3bcdrecordwriter.cpp | 2 ++
1 file changed, 2 insertions(+)
Index: k3b-1.0.5-kde#156684.patch
===================================================================
RCS file: k3b-1.0.5-kde#156684.patch
diff -N k3b-1.0.5-kde#156684.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ k3b-1.0.5-kde#156684.patch 26 Sep 2009 18:03:01 -0000 1.3
@@ -0,0 +1,15 @@
+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 ) {
Index: k3brc
===================================================================
RCS file: k3brc
diff -N k3brc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ k3brc 26 Sep 2009 18:03:01 -0000 1.4
@@ -0,0 +1,6 @@
+[General Options]
+check system config=false
+Manual buffer size=true
+
+[Notification Messages]
+Don't prompt me again.=No
reload-for-verification.diff:
k3bverificationjob.cpp | 14 ++++++++++++++
k3bverificationjob.h | 1 +
2 files changed, 15 insertions(+)
--- 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: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/k3b/F-12/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore 27 May 2009 13:30:33 -0000 1.22
+++ .cvsignore 26 Sep 2009 18:03:01 -0000 1.23
@@ -1 +1,2 @@
-k3b-1.66.0alpha2.tar.bz2
+k3b-1.0.5.tar.bz2
+k3b-i18n-1.0.5.tar.bz2
Index: k3b.spec
===================================================================
RCS file: /cvs/pkgs/rpms/k3b/F-12/k3b.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- k3b.spec 25 Jul 2009 04:15:18 -0000 1.76
+++ k3b.spec 26 Sep 2009 18:03:01 -0000 1.77
@@ -1,43 +1,104 @@
-%define pre alpha2
+## distro/release specific support
+%if 0%{?fedora} > 4 || 0%{?rhel} > 4
+%define _with_hal --with-hal
+%endif
+
+%if 0%{?fedora} > 6
+%define kdelibs3 kdelibs3
+%else
+%define kdelibs3 kdelibs
+BuildRequires: libutempter-devel
+%endif
+
+# include sub pkgs
+%if 0%{?fedora} > 9 || 0%{?rhel} > 5
+%define common 1
+%endif
+%define devel 1
+%define i18n 1
Name: k3b
Summary: CD/DVD burning application
-Epoch: 0
-Version: 1.66.0
-Release: 4%{?dist}
+Epoch: 1
+Version: 1.0.5
+Release: 10%{?dist}
Group: Applications/Archiving
License: GPLv2+
-URL: http://www.k3b.org/
-Source0: http://downloads.sourceforge.net/sourceforge/k3b/k3b-%{version}%{pre}.tar.bz2
+URL: http://www.k3b.org
+Source0: http://downloads.sf.net/k3b/k3b-%{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
-# FIXME/TODO: review configs/patches from k3b-1.0.x, to see if any are still applicable here
+Source2: k3brc
-BuildRequires: cmake
+Patch2: k3b-1.0.3-umount.patch
+# manual bufsize (upstream?)
+Patch4: k3b-1.0.4-manualbufsize.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
+# upstreamed 2008-08-27
+Patch105: k3b-1.0.5-hidden.patch
+#
+Patch106: k3b-1.0.5-desktopfile.patch
+
+BuildRequires: %{kdelibs3}-devel
BuildRequires: desktop-file-utils
+BuildRequires: alsa-lib-devel
+BuildRequires: audiofile-devel
+%{?_with_hal:BuildRequires: dbus-qt-devel hal-devel}
BuildRequires: flac-devel
BuildRequires: gettext
-BuildRequires: kdelibs4-devel
-BuildRequires: kdemultimedia-devel
BuildRequires: libdvdread-devel
BuildRequires: libmpcdec-devel
BuildRequires: libmusicbrainz-devel
BuildRequires: libsamplerate-devel
BuildRequires: libsndfile-devel
BuildRequires: libvorbis-devel
-# needed by k3bsetup
-#BuildRequires: polkit-qt-devel
BuildRequires: taglib-devel
+BuildRequires: zlib-devel
+
+Obsoletes: k3b-extras < 0:1.0-1
+Provides: k3b-extras = %{epoch}:%{version}-%{release}
-Requires: %{name}-libs = %{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): coreutils
+Requires(postun): coreutils
+
+Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
+%if 0%{?common}
+Requires: %{name}-common = %{epoch}:%{version}-%{release}
+%else
+Obsoletes: %{name}-common < %{epoch}:%{version}-%{release}
+Provides: %{name}-common = %{epoch}:%{version}-%{release}
+%endif
Requires: cdrecord mkisofs
+%if 0%{?fedora} > 3
Requires(hint): cdrdao
Requires(hint): dvd+rw-tools
+#Requires(hint): gnome-mount
+%endif
%description
K3b provides a comfortable user interface to perform most CD/DVD
@@ -46,6 +107,14 @@ steps of the burning process the beginne
automatic settings and the reasonable k3b defaults which allow a quick
start.
+%package common
+Summary: Common files of %{name}
+Group: Applications/Archiving
+Requires: %{name} = %{epoch}:%{version}-%{release}
+BuildArch: noarch
+%description common
+{summary}.
+
%package libs
Summary: Runtime libraries for %{name}
Group: System Environment/Libraries
@@ -56,34 +125,92 @@ Requires: %{name} = %{epoch}:%{version}-
%package devel
Summary: Files for the development of applications which will use %{name}
Group: Development/Libraries
-Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
%description devel
%{summary}.
%prep
-%setup -q -n %{name}-%{version}
+%setup -q %{?i18n:-a 1} -n %{name}-%{version}
+
+%patch2 -p1 -b .umount
+# set in k3brc too
+%patch4 -p1 -b .manualbufsize
+
+#patch100 -p1 -b .kde#151816
+#patch101 -p1 -b .kde#156684
+%patch102 -p0 -b .kde#156684
+%patch105 -p1 -b .hidden
+%patch106 -p1 -b .desktopfile
%build
+unset QTDIR || : ; . /etc/profile.d/qt.sh
-mkdir -p %{_target_platform}
-pushd %{_target_platform}
-%{cmake_kde4} \
- -DK3B_BUILD_K3BSETUP=OFF \
- ..
+%configure \
+ --includedir=%{_includedir}/k3b \
+ --disable-rpath \
+ --enable-new-ldflags \
+ --disable-debug --disable-warnings \
+ --disable-dependency-tracking --enable-final \
+ --with-k3bsetup=no \
+ --without-cdrecord-suid-root \
+ --with-oggvorbis \
+ --with-flac \
+ --with-external-libsamplerate \
+ --with-libdvdread \
+ --with-musicbrainz \
+ --with-sndfile \
+ --without-ffmpeg --without-lame --without-libmad \
+ --with-musepack \
+ %{?_with_hal} %{!?_with_hal:--without-hal}
+
+make %{?_smp_mflags}
+
+%if 0%{?i18n}
+# Build for i18n tarball
+pushd %{name}-i18n-%{version}
+%configure
+make %{?_smp_mflags}
popd
-
-make %{?_smp_mflags} -C %{_target_platform}
+%endif
%install
rm -rf %{buildroot}
-make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
+make install DESTDIR=%{buildroot}
+
+%if 0%{?i18n}
+make install DESTDIR=%{buildroot} -C %{name}-i18n-%{version}
+%endif
+
+%{__install} -D -m 644 -p %{SOURCE2} %{buildroot}%{_datadir}/config/k3brc
+
+# remove the .la files
+rm -f %{buildroot}%{_libdir}/libk3b*.la
+
+# remove i18n for Plattdeutsch (Low Saxon)
+rm -fr %{buildroot}%{_datadir}/locale/nds
+
+%if 0%{?i18n}
+%find_lang k3b --with-kde
+%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 %{buildroot}%{_includedir}/k3b/
+rm -f %{buildroot}%{_libdir}/libk3b*.so
+%endif
%check
-desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/k3b.desktop
+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
@@ -94,62 +221,65 @@ rm -rf %{buildroot}
%postun libs -p /sbin/ldconfig
-%post
-touch --no-create %{_kde4_iconsdir}/hicolor ||:
-
-%posttrans
-gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
-update-desktop-database -q &> /dev/null ||:
+%post %{?common:common}
+touch --no-create %{_datadir}/icons/hicolor ||:
-%postun
+%postun %{?common:common}
if [ $1 -eq 0 ] ; then
-touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
-gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
-update-desktop-database -q &> /dev/null ||:
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+update-desktop-database -q &> /dev/null
fi
+%posttrans %{?common:common}
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+update-desktop-database -q &> /dev/null
+
-%files
+%files %{?!common:-f all.lang}
%defattr(-,root,root,-)
%doc AUTHORS README COPYING TODO ChangeLog
-%{_kde4_bindir}/k3b
-%{_kde4_appsdir}/k3b/
-%{_kde4_appsdir}/konqsidebartng/virtual_folders/services/*.desktop
-%{_kde4_appsdir}/solid/actions/*.desktop
-%{_kde4_datadir}/applications/kde4/k3b.desktop
-%{_kde4_datadir}/kde4/services/*.desktop
-%{_kde4_datadir}/kde4/services/*.protocol
-%{_kde4_datadir}/kde4/services/ServiceMenus/k3b*.desktop
-%{_kde4_datadir}/kde4/servicetypes/k3b*.desktop
-%{_kde4_datadir}/sounds/k3b_*
-%{_kde4_iconsdir}/hicolor/*/*/*
-%{_kde4_libdir}/kde4/*.so
+%{_bindir}/k3b
+%{_libdir}/kde3/*.so
+%{_libdir}/kde3/*.la
+
+%if 0%{?common}
+%files common -f all.lang
+%endif
+%{_datadir}/applications/kde/k3b-cue.desktop
+%{_datadir}/applications/kde/k3b-iso.desktop
+%{_datadir}/applications/kde/k3b.desktop
+%{_datadir}/apps/k3b/
+%{_datadir}/apps/konqueror/servicemenus/*.desktop
+%{_datadir}/apps/konqsidebartng/virtual_folders/services/videodvd.desktop
+%{_datadir}/config/k3brc
+%{_datadir}/mimelnk/application/x-k3b.desktop
+%{_datadir}/icons/hicolor/*/*/*
+%{_datadir}/services/kfile_k3b.desktop
+%{_datadir}/services/videodvd.protocol
+%{_datadir}/sounds/k3b_*.wav
%files libs
%defattr(-,root,root,-)
-%{_kde4_libdir}/libk3b*.so.*
+%{_libdir}/libk3b.so.3*
+%{_libdir}/libk3bdevice.so.5*
+%if 0%{?devel}
%files devel
%defattr(-,root,root,-)
-%{_kde4_includedir}/k3b*
-%{_kde4_libdir}/libk3b*.so
+%{_includedir}/k3b/
+%{_libdir}/libk3b.so
+%{_libdir}/libk3bdevice.so
+%endif
%changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.66.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Thu Jun 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 0:1.66.0-3
-- -extras-freeworld avail now, drop Obsoletes
-
-* Wed Jun 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 0:1.66.0-2
-- Obsoletes: k3b-extras-freeworld (at least until it's ready)
-
-* Wed May 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 0:1.66.0-1
-- k3b-1.66.0 (alpha2)
+* Sat Sep 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 1:1.0.5-10
+- Epoch: 1 (increment Release too, to minimize confusion)
+- -common: noarch subpkg
-* Wed Apr 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 0:1.65.0-1
-- k3b-1.65.0 (alpha1)
+* 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
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/k3b/F-12/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources 27 May 2009 13:30:33 -0000 1.23
+++ sources 26 Sep 2009 18:03:01 -0000 1.24
@@ -1 +1,2 @@
-60717ca718da93ee65f5fc2c0d9e8c71 k3b-1.66.0alpha2.tar.bz2
+e3b37d0d009af3dd149215d6ae0d54f3 k3b-1.0.5.tar.bz2
+610b1fd9356c89cbb38b6dda1f115c86 k3b-i18n-1.0.5.tar.bz2
- Previous message (by thread): rpms/kernel/F-11 kvm-guest-fix-bogus-wallclock-physical-address-calculation.patch, NONE, 1.1 kvm-mmu-make-__kvm_mmu_free_some_pages-handle-empty-list.patch, NONE, 1.1 kvm-vmx-check-cpl-before-emulating-debug-register-access.patch, NONE, 1.1 kvm-vmx-fix-cr8-exiting-control-clobbering-by-ept.patch, NONE, 1.1 kvm-x86-disallow-hypercalls-for-guest-callers-in-rings-0.patch, NONE, 1.1 kernel.spec, 1.1743, 1.1744
- Next message (by thread): rpms/k3b/devel k3b.spec,1.76,1.77
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list