OBS User unknown 2009-05-28 03:05:52 +00:00 committed by Git OBS Bridge
parent c1e86af86a
commit dac6634de2
6 changed files with 36 additions and 44 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6ec9e54e122c1f6c24fc4ba4ac23e3860e11d7166345516522b9a7790fe0ce9f
size 3863402

3
k3b-1.66.0alpha2.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2f66ccae344d832c8522a88d6aede2b73e694c9fe1fe87610c0ff0a76f08671d
size 3865548

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Wed May 27 12:31:29 CEST 2009 - beineri@opensuse.org
- update to 1.66 Alpha 2: many bugfixes
-------------------------------------------------------------------
Sun May 3 15:31:49 CEST 2009 - cmorve69@yahoo.es
- Add support for Musepack/MPC
- Disable K3BSetup
-------------------------------------------------------------------
Thu Apr 23 10:45:01 CEST 2009 - beineri@opensuse.org

View File

@ -1,5 +1,5 @@
#
# spec file for package k3b (Version 1.65.0)
# spec file for package k3b (Version 1.66.0)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -15,8 +15,10 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
%bcond_with ffmpeg
%bcond_with mad
%bcond_with lame
Name: k3b
BuildRequires: cups-devel libkcddb4-devel ruby-devel sqlite-devel taglib-devel
@ -24,20 +26,25 @@ BuildRequires: libkcompactdisc4-devel libkdepimlibs4-devel tse3-devel update-de
BuildRequires: gstreamer010-devel libmtp-devel libnjb-devel libvisual-devel xine-devel
BuildRequires: flac-devel libQtWebKit-devel libdvdread-devel libvorbis-devel
BuildRequires: dbus-1-glib-devel libogg-devel libsamplerate-devel libsndfile-devel
%if %suse_version > 1030
BuildRequires: libmusicbrainz3-devel
BuildRequires: libmpcdec-devel libmusicbrainz-devel
%if %{with ffmpeg}
BuildRequires: libffmpeg-devel
%endif
%if %{with mad}
BuildRequires: libmad-devel
%endif
%if %{with lame}
BuildRequires: libmp3lame-devel
%endif
Url: http://k3b.sourceforge.net/
License: GPL v2 or later
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.65.0
Release: 2
Version: 1.66.0
Release: 1
# svn.kde.org/home/kde/trunk/extragear/multimedia/k3b
Source0: k3b-1.65.0alpha1.tar.bz2
Patch0: r957664.diff
Patch1: qt44.diff
Source0: k3b-1.66.0alpha2.tar.bz2
Patch2: kde41.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%kde4_runtime_requires
@ -75,12 +82,10 @@ Authors:
%prep
%setup -q -n k3b-%{version}
%patch
%patch1
%patch2
%build
%cmake_kde4 -d build
%cmake_kde4 -d build -- -DK3B_BUILD_K3BSETUP=OFF
%make_jobs
%install
@ -99,7 +104,6 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
/usr/bin/k3b
#/usr/bin/k3bsetup
/usr/%_lib/kde4/k3b*.so
/usr/%_lib/kde4/kcm_k3b*.so
/usr/%_lib/kde4/kio_videodvd.so
@ -126,6 +130,11 @@ 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

View File

@ -1,15 +0,0 @@
Index: libk3bdevice/k3bdevice.cpp
===================================================================
--- libk3bdevice/k3bdevice.cpp (revision 958425)
+++ libk3bdevice/k3bdevice.cpp (working copy)
@@ -1446,7 +1446,9 @@
if( readTocPmaAtip( &data, dataLen, 5, false, 0 ) ) {
// we need more than the header and a multiple of 18 bytes to have valid CD-TEXT
if( dataLen > 4 && dataLen%18 == 4 ) {
- textData.append( reinterpret_cast<char*>(data), dataLen );
+ // keep building with Qt 4.4
+ QByteArray cdtext( reinterpret_cast<char*>(data), dataLen );
+ textData.append( cdtext );
if ( success )
*success = true;
}

View File

@ -1,13 +0,0 @@
Index: cmake/modules/FindPolkitQt.cmake
===================================================================
--- cmake/modules/FindPolkitQt.cmake (revision 957663)
+++ cmake/modules/FindPolkitQt.cmake (revision 957664)
@@ -25,7 +25,7 @@
set(POLKITQT_MIN_VERSION "0.9.0")
endif (NOT POLKITQT_MIN_VERSION)
-pkg_search_module( POLKITQT REQUIRED polkit-qt )
+pkg_search_module( POLKITQT polkit-qt )
if (POLKITQT_FOUND)
if (POLKITQT_VERSION VERSION_LESS POLKITQT_MIN_VERSION)