Changes - j0ke.net Open Build Service

Changes of Revision 4

[-] [+]	Changed	k3b.spec
@@ -1,34 +1,69 @@ -# norootforbuild - -%define optflags ${RPM_OPT_FLAGS} -fno-strict-aliasing -D__STDC_CONSTANT_MACROS +# +# spec file for package k3b +# +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + + +%bcond_with ffmpeg +%bcond_with mad +%bcond_with lame Name: k3b BuildRequires: cups-devel libkcddb4-devel ruby-devel sqlite-devel taglib-devel BuildRequires: libkcompactdisc4-devel libkdepimlibs4-devel tse3-devel update-desktop-files -BuildRequires: gstreamer010-devel libmtp-devel libnjb-devel libvisual-devel libxine-devel +BuildRequires: gstreamer010-devel libmtp-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 BuildRequires: libmpcdec-devel libmusicbrainz-devel -BuildRequires: libffmpeg-devel libmad-devel libmp3lame-devel -BuildRequires: fdupes # only needed to patch broken images in the upstream tarball: BuildRequires: ImageMagick +%if 0%{?suse_version} < 1140 +BuildRequires: libnjb-devel +%endif +%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 +License: GPLv2+ Group: Productivity/Multimedia/CD/Record -Summary: Universal CD and DVD Burning Application +Summary: A Universal CD and DVD Burning Application Requires: /usr/bin/cdrecord /usr/bin/mkisofs /usr/bin/cdrdao dvd+rw-tools Version: 2.0.2 -Release: 6 -Source: http://prdownloads.sourceforge.net/k3b/k3b-%{version}.tar.bz2 +Release: 8 +%define rversion %version +# svn.kde.org/home/kde/trunk/extragear/multimedia/k3b +Source0: k3b-%{version}.tar.bz2 Patch1: initial-preference.diff -Source99: k3b-rpmlintrc +Patch3: add_mimetypes_bnc661777.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build -%kde4_runtime_requires +%kde4_runtime_requires +Requires(post): shared-mime-info +Requires(postun): shared-mime-info Provides: kde4-k3b = 4.2.1.svn942189 Provides: kde4-k3b = 4.2.2.svn951754 -Obsoletes: kde4-k3b < 4.2.2.svn951754 +Obsoletes: kde4-k3b <= 4.2.2.svn951754 Recommends: %{name}-lang = %{version} +%if 0%{?suse_version} >= 1030 +BuildRequires: fdupes +%endif %description K3b is a CD burning application that supports Ogg Vorbis, MP3 audio @@ -42,7 +77,6 @@ Thomas Froescher <tfroescher@gmx.de> %package devel -License: GPL v2 or later Summary: A Universal CD and DVD Burning Application Group: Development/Libraries/C and C++ Requires: %name = %version @@ -58,19 +92,18 @@ Sebastian Trueg <trueg@informatik.uni-freiburg.de> Thomas Froescher <tfroescher@gmx.de> - +%if %{with ffmpeg} \|\| %{with mad} \|\| %{with lame} %package codecs -License: GPL v2 or later -Summary: A Universal CD and DVD Burning Application Build Environemnt +Summary: Full Multimedia Codec Support for k3b Group: Productivity/Multimedia/CD/Record Requires: %name = %version %kde4_runtime_requires %description codecs K3b is a CD burning application that supports Ogg Vorbis, MP3 audio -files, DVD burning, CDDB, and much more. This package contains its -build environment. +files, DVD burning, CDDB, and much more. +This package contains the support for MP3 and similar codecs. @@ -78,16 +111,29 @@ -------- Sebastian Trueg <trueg@informatik.uni-freiburg.de> Thomas Froescher <tfroescher@gmx.de> +%endif -%debug_package %lang_package %prep -%setup -q -%patch1 -p1 -#for l in ast csb hne; do -# %__rm -rf "po/$l" -# %__sed -i "/add_subdirectory( $l )/d" po/CMakeLists.txt -#done +%setup -q -n k3b-%{version} +%patch1 +%patch3 + +%if %{with mad} +echo "WITH MAD" +%else +echo "WITHOUT MAD" +%endif +%if %{with lame} +echo "WITH LAME" +%else +echo "WITHOUT LAME" +%endif +%if %{with ffmpeg} +echo "WITH FFMPEG" +%else +echo "WITHOUT FFMPEG" +%endif # patch image with wrong dimensions pushd src/icons/actions @@ -111,89 +157,115 @@ done popd #src/icons/actions -#echo "find_package(Msgfmt REQUIRED)" >> CMakeLists.txt -#echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt -#echo "add_subdirectory( po )" >> CMakeLists.txt -#echo "add_subdirectory( doc-translations )" >> CMakeLists.txt -#echo "add_subdirectory( doc )" >> CMakeLists.txt - %build - %cmake_kde4 -d build -- -DK3B_BUILD_K3BSETUP=OFF +%if 0%{?suse_version} > 1130 +CMAKEPARAMS="-DK3B_ENABLE_HAL_SUPPORT=OFF" +%else +CMAKEPARAMS="" +%endif + + %cmake_kde4 -d build -- $CMAKEPARAMS %make_jobs %install pushd build %makeinstall + %if %{with mad} %__install -D -m0755 lib/k3bmaddecoder.so %buildroot/%_libdir/kde4/k3bmaddecoder.so - -rm -rf %buildroot/usr/share/locale/sr@ijekavian -rm -rf %buildroot/usr/share/locale/sr@ijekavianlatin + %endif popd - %suse_update_desktop_file -r k3b AudioVideo DiscBurning + %suse_update_desktop_file k3b DiscBurning %kde_post_install - %if %suse_version < 1120 - # work-around bnc#457908 - for i in uk fr de et nl pt es sv; do install -d "$RPM_BUILD_ROOT/usr/share/doc/kde/HTML/$i/common"; done - %endif - L="%{name}.lang" - echo -n >"$L" - # kio_videodvd - for x in k3b k3bsetup libk3b libk3bdevice kio_videodvd; do - %find_lang "$x" "_$x.lang" - cat "_$x.lang" >>"$L" - done -
[-] [+]	Added	add_mimetypes_bnc661777.diff ^
@@ -0,0 +1,11 @@ +--- src/k3b.desktop 2011-01-15 21:47:30.000000000 +0100 ++++ src/k3b.desktop 2011-01-16 12:08:05.698000050 +0100 +@@ -137,7 +137,7 @@ + Name[x-test]=xxK3bxx + Name[zh_CN]=K3b + Name[zh_TW]=K3b +-MimeType=application/x-k3b;application/x-iso;application/x-cd-image;application/x-cue; ++MimeType=application/x-k3b;application/x-iso;application/x-cd-image;application/x-cue;x-content/blank-cd;x-content/blank-dvd;x-content/blank-bd;x-content/blank-hddvd; + X-KDE-StartupNotify=true + X-KDE-NativeMimeType=application/x-k3b; + Categories=KDE;Qt;AudioVideo;DiscBurning;System;Filesystem;
[-] [+]	Changed	initial-preference.diff ^
@@ -1,6 +1,5 @@ -diff -Nur k3b-2.0.2-orig/src/k3b.desktop k3b-2.0.2/src/k3b.desktop ---- k3b-2.0.2-orig/src/k3b.desktop 2011-01-31 23:30:34.088611403 +0100 -+++ k3b-2.0.2/src/k3b.desktop 2011-01-31 23:31:43.969861554 +0100 +--- src/k3b.desktop 2011-01-15 21:47:30.000000000 +0100 ++++ src/k3b.desktop 2011-01-16 12:06:51.077000058 +0100 @@ -142,3 +142,4 @@ X-KDE-NativeMimeType=application/x-k3b; Categories=KDE;Qt;AudioVideo;DiscBurning;System;Filesystem;
[-] [+]	Deleted	k3b-rpmlintrc ^
@@ -1,2 +0,0 @@ -addFilter("W: shlib-policy-missing-suffix.*") -addFilter("W: useless-provides kde4-k3b")