OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/k3b?expand=0&rev=3

k3b.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jul 23 12:59:15 CEST 2009 - beineri@opensuse.org
+
+- apply trunk diff (r1001450) when building on 11.2
+
 -------------------------------------------------------------------
 Wed May 27 12:31:29 CEST 2009 - beineri@opensuse.org
 

k3b.spec

@@ -42,9 +42,10 @@ Group:          Productivity/Multimedia/CD/Record
 Summary:        A Universal CD and DVD Burning Application
 Requires:       /usr/bin/cdrecord /usr/bin/mkisofs /usr/bin/cdrdao dvd+rw-tools
 Version:        1.66.0
-Release:        1
+Release:        2
 # svn.kde.org/home/kde/trunk/extragear/multimedia/k3b
 Source0:        k3b-1.66.0alpha2.tar.bz2
+Patch1:         trunk.diff
 Patch2:         kde41.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %kde4_runtime_requires 
@@ -82,7 +83,11 @@ Authors:
 
 %prep
 %setup -q -n k3b-%{version}
+%if %suse_version > 1110
+%patch1
+%else
 %patch2
+%endif
 
 %build
   %cmake_kde4 -d build -- -DK3B_BUILD_K3BSETUP=OFF
@@ -130,54 +135,3 @@ rm -rf $RPM_BUILD_ROOT
 /usr/%_lib/libk3bdevice.so
 
 %changelog
-* Wed May 27 2009 beineri@opensuse.org
-- update to 1.66 Alpha 2: many bugfixes
-* Sun May 03 2009 cmorve69@yahoo.es
-- Add support for Musepack/MPC
-- Disable K3BSetup
-* Thu Apr 23 2009 beineri@opensuse.org
-- rename to k3b, update to 1.65.0 Alpha
-* Sat Mar 21 2009 beineri@opensuse.org
-- update to 4.2.1.svn942189
-* Wed Feb 25 2009 stbinner@suse.de
-- update to 4.2.0.svn931376
-* Wed Feb 18 2009 stbinner@suse.de
-- update to 4.2.0.svn927728
-* Sat Jan 24 2009 stbinner@suse.de
-- update to 4.1.4.svn915827
-* Wed Jan 07 2009 stbinner@suse.de
-- update to 4.1.4.svn907132
-* Tue Dec 16 2008 stbinner@suse.de
-- update to 4.1.3.svn897517
-* Sat Nov 22 2008 stbinner@suse.de
-- update to 4.1.3.svn887510
-* Fri Nov 07 2008 stbinner@suse.de
-- update to 4.1.3.svn881374
-* Sat Sep 13 2008 stbinner@suse.de
-- update to 4.1.1.svn860449
-* Fri Aug 22 2008 stbinner@suse.de
-- update to 4.1.0.svn851044
-* Fri Jul 25 2008 stbinner@suse.de
-- update to 4.1.0.svn837567
-* Wed Jul 16 2008 stbinner@suse.de
-- update to 4.0.98.svn833153
-* Fri Jun 27 2008 dmueller@suse.de
-- update to 4.0.84.svn825098
-* Tue Jun 03 2008 dmueller@suse.de
-- update to 4.0.81.svn816194
-* Thu May 15 2008 dmueller@suse.de
-- update to 4.0.74.svn808129
-* Wed May 07 2008 dmueller@suse.de
-- update to 4.0.73.svn805196
-* Thu Apr 24 2008 dmueller@suse.de
-- update to 4.0.71.svn800684
-* Fri Apr 18 2008 dmueller@suse.de
-- update to 4.0.69.svn798537
-* Wed Apr 02 2008 dmueller@suse.de
-- update to 4.0.68.svn792936
-* Fri Feb 15 2008 dmueller@suse.de
-- update to 4.0.62.svn775117
-* Wed Nov 28 2007 dmueller@suse.de
-- update to 3.96.0.svn742626
-* Thu Nov 01 2007 dmueller@suse.de
-- update to 3.95.0.svn731749