Changes - j0ke.net Open Build Service

Changes of Revision 10

[-] [+]	Changed	k3b.spec
@@ -1,32 +1,35 @@ # norootforbuild +%define _prefix /opt/kde3 +%define _sysconfdir /etc/opt/kde3 + Name: k3b -BuildRequires: cdparanoia flac-devel hal-devel kdelibs3-devel libdvdread-devel libmusicbrainz-devel libsamplerate-devel libsndfile-devel taglib-devel a52dec libjack0 libjack-devel -BuildRequires: ffmpeg-devel mad-devel libmp3lame-devel -%if %suse_version > 1010 \|\| 0%{?sles_version} == 10 +BuildRequires: cdparanoia flac-devel hal-devel kdelibs3-devel libdvdread-devel libmusicbrainz-devel libsamplerate-devel libsndfile-devel taglib-devel a52dec +BuildRequires: ffmpeg-devel mad-devel lame +%if 0%{?suse_version} > 1010 \|\| 0%{?sles_version} == 10 BuildRequires: libmpcdec-devel %else BuildRequires: libmpcdec libamrnb-devel %endif -%if %suse_version < 1010 +%if 0%{?suse_version} < 1010 BuildRequires: taglib %endif -%if %suse_version <= 1000 +%if 0%{?suse_version} <= 1000 BuildRequires: update-desktop-files %endif URL: http://k3b.sourceforge.net/ License: GPL v2 or later Group: Productivity/Multimedia/CD/Record -Summary: A Universal CD and DVD Burning Application +Summary: Universal CD and DVD Burning Application Requires: /usr/bin/cdrecord /usr/bin/mkisofs /usr/bin/cdrdao dvd+rw-tools Version: 1.0.5 -Release: 1 -%if %suse_version > 1020 +Release: 7 +%if 0%{?suse_version} > 1020 Requires: %{name}-lang = %{version} %endif BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: http://prdownloads.sourceforge.net/k3b/k3b-%{version}.tar.bz2 -Source1: http://prdownloads.sourceforge.net/k3b/k3b-i18n-%{version}.tar.bz2 +Source0: http://prdownloads.sourceforge.net/k3b/k3b-%{version}.tar.bz2 +Source1: http://prdownloads.sourceforge.net/k3b/k3b-i18n-%{version}.tar.bz2 Source3: k3b_create_video_dvd.desktop Patch1: k3b-resmgr.diff Patch2: k3b-hide-misleading-message.diff @@ -38,11 +41,17 @@ Patch9: k3b-fix_mountpoint.diff Patch10: k3b-install-dvd-desktops.diff Patch11: k3binterferingsystemshandler.diff -%if %suse_version > 930 && %suse_version < 1110 +Patch12: %{name}-%{version}-ffmpeg.patch + +%if 0%{?suse_version} < 1110 Requires: hal-resmgr %endif # see 114320 +%if 0%{?suse_version} >1030 +Requires: suse_help_viewer kdebase3-runtime +%else Requires: kdebase3 +%endif %description This package extends the opensuse package by some codecs. @@ -107,7 +116,19 @@ Sebastian Trueg <trueg@informatik.uni-freiburg.de> Thomas Froescher <tfroescher@gmx.de> -%lang_package +%if 0%{?suse_version} > 1020 +%package lang +Summary: Languages for package %{name} +Group: System/Localization +Requires: %{name} = %{version} +Provides: %{name}-lang-all = %{version}-%{release} +Supplements: packageand(bundle-lang-other:%{name}) + +%description lang +Provides translations to the package %{name}. +%endif + +%debug_package %prep %setup -q -b 1 #%patch1 @@ -120,38 +141,42 @@ #%patch9 %patch10 #%patch11 +%patch12 -p1 + cp %{SOURCE3} src/konqi/ - . /etc/opt/kde3/common_options - update_admin - cd ../k3b-i18n-%version - update_admin +. /etc/opt/kde3/common_options +update_admin +cd "../k3b-i18n-%version" +update_admin %build - . /etc/opt/kde3/common_options +. /etc/opt/kde3/common_options export CFLAGS="$CFLAGS -O0 -g" export CXXFLAGS="$CFLAGS" - ./configure $configkde \ - --with-k3bsetup=no --without-cdrecord-suid-root \ +./configure $configkde \ + --with-k3bsetup=no --without-cdrecord-suid-root \ --enable-resmgr \ --disable-final - make %{?jobs:-j %jobs} - cd ../k3b-i18n-%version - ./configure $configkde - make +make %{?jobs:-j %jobs} +cd ../k3b-i18n-%version +./configure $configkde +make %install - . /etc/opt/kde3/common_options - make DESTDIR=$RPM_BUILD_ROOT $INSTALL_TARGET - cd ../k3b-i18n-%version - make DESTDIR=$RPM_BUILD_ROOT $INSTALL_TARGET - cd - -%suse_update_desktop_file k3b DiscBurning -%if %suse_version > 1000 +. /etc/opt/kde3/common_options +make DESTDIR="%{buildroot}" $INSTALL_TARGET +pushd "../k3b-i18n-%{version}" +make DESTDIR="%{buildroot}" $INSTALL_TARGET +popd +%suse_update_desktop_file -r k3b DiscBurning + +%if 0%{?suse_version} > 1000 %find_lang %name --all-name %else %find_lang %name %endif - kde_post_install + +kde_post_install %post -p /sbin/ldconfig @@ -159,89 +184,82 @@ %clean %__rm -rf "%{buildroot}" -%if %suse_version > 1020 +%if 0%{?suse_version} > 1020 %files lang -f %name.lang - %files %else - %files -f %name.lang %endif %defattr(-,root,root) %doc COPYING AUTHORS -%if %suse_version > 930 -%dir /opt/kde3/share/icons/hicolor/128x128 -%dir /opt/kde3/share/icons/hicolor/128x128/apps -%dir /opt/kde3/share/icons/hicolor/16x16/apps -%dir /opt/kde3/share/icons/hicolor/16x16 -%dir /opt/kde3/share/icons/hicolor/32x32/apps -%dir /opt/kde3/share/icons/hicolor/32x32 -%dir /opt/kde3/share/icons/hicolor/48x48 -%dir /opt/kde3/share/icons/hicolor/48x48/apps -%dir /opt/kde3/share/icons/hicolor/64x64 -%dir /opt/kde3/share/icons/hicolor/64x64/apps -%endif -/opt/kde3/bin/k3b -/opt/kde3/%_lib/kde3/libk3bexternalencoder.la -/opt/kde3/%_lib/kde3/libk3bexternalencoder.so -/opt/kde3/%_lib/kde3/libk3bflacdecoder.la -/opt/kde3/%_lib/kde3/libk3bflacdecoder.so -/opt/kde3/%_lib/kde3/libk3boggvorbisencoder.la -/opt/kde3/%_lib/kde3/libk3boggvorbisencoder.so -/opt/kde3/%_lib/kde3/libk3boggvorbisdecoder.la -/opt/kde3/%_lib/kde3/libk3boggvorbisdecoder.so -/opt/kde3/%_lib/kde3/libk3bsoxencoder.so -/opt/kde3/%_lib/kde3/libk3bsoxencoder.la -/opt/kde3/%_lib/kde3/libk3bwavedecoder.so -/opt/kde3/%_lib/kde3/libk3bwavedecoder.la -/opt/kde3/%_lib/kde3/libk3balsaoutputplugin.la -/opt/kde3/%_lib/kde3/libk3balsaoutputplugin.so -/opt/kde3/%_lib/kde3/libk3baudiometainforenamerplugin.la -/opt/kde3/%_lib/kde3/libk3baudiometainforenamerplugin.so -/opt/kde3/%_lib/kde3/libk3baudioprojectcddbplugin.la -/opt/kde3/%_lib/kde3/libk3baudioprojectcddbplugin.so -/opt/kde3/%_lib/kde3/kfile_k3b.so -/opt/kde3/%_lib/kde3/kfile_k3b.la -/opt/kde3/%_lib/kde3/kio_videodvd.so -/opt/kde3/%_lib/kde3/kio_videodvd.la -/opt/kde3/%_lib/kde3/libk3blibsndfiledecoder.so x 1 @@ -1,32 +1,35 @@ 2 # norootforbuild 3 4 +%define _prefix /opt/kde3 5 +%define _sysconfdir /etc/opt/kde3 6 + 7 Name: k3b 8 -BuildRequires: cdparanoia flac-devel hal-devel kdelibs3-devel libdvdread-devel libmusicbrainz-devel libsamplerate-devel libsndfile-devel taglib-devel a52dec libjack0 libjack-devel 9 -BuildRequires: ffmpeg-devel mad-devel libmp3lame-devel 10 -%if %suse_version > 1010 \|\| 0%{?sles_version} == 10 11 +BuildRequires: cdparanoia flac-devel hal-devel kdelibs3-devel libdvdread-devel libmusicbrainz-devel libsamplerate-devel libsndfile-devel taglib-devel a52dec 12 +BuildRequires: ffmpeg-devel mad-devel lame 13 +%if 0%{?suse_version} > 1010 \|\| 0%{?sles_version} == 10 14 BuildRequires: libmpcdec-devel 15 %else 16 BuildRequires: libmpcdec libamrnb-devel 17 %endif 18 -%if %suse_version < 1010 19 +%if 0%{?suse_version} < 1010 20 BuildRequires: taglib 21 %endif 22 -%if %suse_version <= 1000 23 +%if 0%{?suse_version} <= 1000 24 BuildRequires: update-desktop-files 25 %endif 26 URL: http://k3b.sourceforge.net/ 27 License: GPL v2 or later 28 Group: Productivity/Multimedia/CD/Record 29 -Summary: A Universal CD and DVD Burning Application 30 +Summary: Universal CD and DVD Burning Application 31 Requires: /usr/bin/cdrecord /usr/bin/mkisofs /usr/bin/cdrdao dvd+rw-tools 32 Version: 1.0.5 33 -Release: 1 34 -%if %suse_version > 1020 35 +Release: 7 36 +%if 0%{?suse_version} > 1020 37 Requires: %{name}-lang = %{version} 38 %endif 39 BuildRoot: %{_tmppath}/%{name}-%{version}-build 40 -Source0: http://prdownloads.sourceforge.net/k3b/k3b-%{version}.tar.bz2 41 -Source1: http://prdownloads.sourceforge.net/k3b/k3b-i18n-%{version}.tar.bz2 42 +Source0: http://prdownloads.sourceforge.net/k3b/k3b-%{version}.tar.bz2 43 +Source1: http://prdownloads.sourceforge.net/k3b/k3b-i18n-%{version}.tar.bz2 44 Source3: k3b_create_video_dvd.desktop 45 Patch1: k3b-resmgr.diff 46 Patch2: k3b-hide-misleading-message.diff 47 @@ -38,11 +41,17 @@ 48 Patch9: k3b-fix_mountpoint.diff 49 Patch10: k3b-install-dvd-desktops.diff 50 Patch11: k3binterferingsystemshandler.diff 51 -%if %suse_version > 930 && %suse_version < 1110 52 +Patch12: %{name}-%{version}-ffmpeg.patch 53 + 54 +%if 0%{?suse_version} < 1110 55 Requires: hal-resmgr 56 %endif 57 # see 114320 58 +%if 0%{?suse_version} >1030 59 +Requires: suse_help_viewer kdebase3-runtime 60 +%else 61 Requires: kdebase3 62 +%endif 63 64 %description 65 This package extends the opensuse package by some codecs. 66 @@ -107,7 +116,19 @@ 67 Sebastian Trueg <trueg@informatik.uni-freiburg.de> 68 Thomas Froescher <tfroescher@gmx.de> 69 70 -%lang_package 71 +%if 0%{?suse_version} > 1020 72 +%package lang 73 +Summary: Languages for package %{name} 74 +Group: System/Localization 75 +Requires: %{name} = %{version} 76 +Provides: %{name}-lang-all = %{version}-%{release} 77 +Supplements: packageand(bundle-lang-other:%{name}) 78 + 79 +%description lang 80 +Provides translations to the package %{name}. 81 +%endif 82 + 83 +%debug_package 84 %prep 85 %setup -q -b 1 86 #%patch1 87 @@ -120,38 +141,42 @@ 88 #%patch9 89 %patch10 90 #%patch11 91 +%patch12 -p1 92 + 93 cp %{SOURCE3} src/konqi/ 94 - . /etc/opt/kde3/common_options 95 - update_admin 96 - cd ../k3b-i18n-%version 97 - update_admin 98 +. /etc/opt/kde3/common_options 99 +update_admin 100 +cd "../k3b-i18n-%version" 101 +update_admin 102 103 %build 104 - . /etc/opt/kde3/common_options 105 +. /etc/opt/kde3/common_options 106 export CFLAGS="$CFLAGS -O0 -g" 107 export CXXFLAGS="$CFLAGS" 108 - ./configure $configkde \ 109 - --with-k3bsetup=no --without-cdrecord-suid-root \ 110 +./configure $configkde \ 111 + --with-k3bsetup=no --without-cdrecord-suid-root \ 112 --enable-resmgr \ 113 --disable-final 114 - make %{?jobs:-j %jobs} 115 - cd ../k3b-i18n-%version 116 - ./configure $configkde 117 - make 118 +make %{?jobs:-j %jobs} 119 +cd ../k3b-i18n-%version 120 +./configure $configkde 121 +make 122 123 %install 124 - . /etc/opt/kde3/common_options 125 - make DESTDIR=$RPM_BUILD_ROOT $INSTALL_TARGET 126 - cd ../k3b-i18n-%version 127 - make DESTDIR=$RPM_BUILD_ROOT $INSTALL_TARGET 128 - cd - 129 -%suse_update_desktop_file k3b DiscBurning 130 -%if %suse_version > 1000 131 +. /etc/opt/kde3/common_options 132 +make DESTDIR="%{buildroot}" $INSTALL_TARGET 133 +pushd "../k3b-i18n-%{version}" 134 +make DESTDIR="%{buildroot}" $INSTALL_TARGET 135 +popd 136 +%suse_update_desktop_file -r k3b DiscBurning 137 + 138 +%if 0%{?suse_version} > 1000 139 %find_lang %name --all-name 140 %else 141 %find_lang %name 142 %endif 143 - kde_post_install 144 + 145 +kde_post_install 146 147 %post -p /sbin/ldconfig 148 149 @@ -159,89 +184,82 @@ 150 151 %clean 152 %__rm -rf "%{buildroot}" 153 -%if %suse_version > 1020 154 155 +%if 0%{?suse_version} > 1020 156 %files lang -f %name.lang 157 - 158 %files 159 %else 160 - 161 %files -f %name.lang 162 %endif 163 %defattr(-,root,root) 164 %doc COPYING AUTHORS 165 -%if %suse_version > 930 166 -%dir /opt/kde3/share/icons/hicolor/128x128 167 -%dir /opt/kde3/share/icons/hicolor/128x128/apps 168 -%dir /opt/kde3/share/icons/hicolor/16x16/apps 169 -%dir /opt/kde3/share/icons/hicolor/16x16 170 -%dir /opt/kde3/share/icons/hicolor/32x32/apps 171 -%dir /opt/kde3/share/icons/hicolor/32x32 172 -%dir /opt/kde3/share/icons/hicolor/48x48 173 -%dir /opt/kde3/share/icons/hicolor/48x48/apps 174 -%dir /opt/kde3/share/icons/hicolor/64x64 175 -%dir /opt/kde3/share/icons/hicolor/64x64/apps 176 -%endif 177 -/opt/kde3/bin/k3b 178 -/opt/kde3/%_lib/kde3/libk3bexternalencoder.la 179 -/opt/kde3/%_lib/kde3/libk3bexternalencoder.so 180 -/opt/kde3/%_lib/kde3/libk3bflacdecoder.la 181 -/opt/kde3/%_lib/kde3/libk3bflacdecoder.so 182 -/opt/kde3/%_lib/kde3/libk3boggvorbisencoder.la 183 -/opt/kde3/%_lib/kde3/libk3boggvorbisencoder.so 184 -/opt/kde3/%_lib/kde3/libk3boggvorbisdecoder.la 185 -/opt/kde3/%_lib/kde3/libk3boggvorbisdecoder.so 186 -/opt/kde3/%_lib/kde3/libk3bsoxencoder.so 187 -/opt/kde3/%_lib/kde3/libk3bsoxencoder.la 188 -/opt/kde3/%_lib/kde3/libk3bwavedecoder.so 189 -/opt/kde3/%_lib/kde3/libk3bwavedecoder.la 190 -/opt/kde3/%_lib/kde3/libk3balsaoutputplugin.la 191 -/opt/kde3/%_lib/kde3/libk3balsaoutputplugin.so 192 -/opt/kde3/%_lib/kde3/libk3baudiometainforenamerplugin.la 193 -/opt/kde3/%_lib/kde3/libk3baudiometainforenamerplugin.so 194 -/opt/kde3/%_lib/kde3/libk3baudioprojectcddbplugin.la 195 -/opt/kde3/%_lib/kde3/libk3baudioprojectcddbplugin.so 196 -/opt/kde3/%_lib/kde3/kfile_k3b.so 197 -/opt/kde3/%_lib/kde3/kfile_k3b.la 198 -/opt/kde3/%_lib/kde3/kio_videodvd.so 199 -/opt/kde3/%_lib/kde3/kio_videodvd.la 200 -/opt/kde3/%_lib/kde3/libk3blibsndfiledecoder.so 201
[-] [+]	Added	k3b-1.0.5-ffmpeg.patch ^
@@ -0,0 +1,24 @@ +diff -Nur k3b-1.0.5-orig//plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp +--- k3b-1.0.5-orig//plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp 2008-09-16 12:19:13.000000000 +0200 ++++ k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp 2008-09-16 12:27:42.000000000 +0200 +@@ -194,7 +194,7 @@ + return i18n("Windows Media v1"); + case CODEC_ID_WMAV2: + return i18n("Windows Media v2"); +- case CODEC_ID_MP3LAME: ++ case CODEC_ID_MP3: + return i18n("MPEG 1 Layer III"); + case CODEC_ID_AAC: + return i18n("Advanced Audio Coding (AAC)"); +@@ -288,9 +288,9 @@ + d->outputBufferPos = d->outputBuffer; + + #ifdef FFMPEG_BUILD_PRE_4629 +- int len = avcodec_decode_audio( &d->formatContext->streams[0]->codec, ++ int len = avcodec_decode_audio2( &d->formatContext->streams[0]->codec, + #else +- int len = avcodec_decode_audio( d->formatContext->streams[0]->codec, ++ int len = avcodec_decode_audio2( d->formatContext->streams[0]->codec, + #endif + (short*)d->outputBuffer, &d->outputBufferSize, + d->packetData, d->packetSize );