Hello community, here is the log from the commit of package k3b for openSUSE:Factory checked in at Tue May 17 13:25:14 CEST 2011.
-------- --- KDE/k3b/k3b.changes 2011-04-19 16:02:07.000000000 +0200 +++ k3b/k3b.changes 2011-04-27 22:35:16.000000000 +0200 @@ -1,0 +2,20 @@ +Wed Apr 27 20:35:43 UTC 2011 - asterios.dra...@gmail.com + +- Spec file updates: + * Changes based on rpmdevtools templates and spec-cleaner run. + * Cleanup in Buildrequires: entries. + * Added /usr/bin/readcd in Requires:. + * Recommend normalize, sox, transcode and vcdimager packages. + * Fixed rpmlint warning for Provides/Obsoletes of kde4-k3b. + * Updates in Url:, Summary: and %description. + * Added description for the patches based on openSUSE Patches Guidelines. + * Changed k3b-devel Group: to "Development/Libraries/C and C++". + * Compile the package with "-fno-strict-aliasing". + * Added "AudioVideo" to the Categories entry of k3b.desktop file. + * Remove some more locales for openSUSE < 11.4. + * Moved english help files in the main package. + * Updates in %files section (also removed support for openSUSE < 11.2). + * Minor other updates. +- Fixed some rpmlint warnings. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ k3b.spec ++++++ --- /var/tmp/diff_new_pack.Xx7Rv3/_old 2011-05-17 13:23:47.000000000 +0200 +++ /var/tmp/diff_new_pack.Xx7Rv3/_new 2011-05-17 13:23:47.000000000 +0200 @@ -21,94 +21,139 @@ %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 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 +Version: 2.0.2 +Release: 12 +Summary: CD/DVD/Blu-ray Burning Application for KDE + +License: GPLv2+ +Url: http://www.k3b.org/ +Group: Productivity/Multimedia/CD/Record +Source0: http://prdownloads.sourceforge.net/k3b/%{name}-%{version}.tar.bz2 +# PATCH-FIX-OPENSUSE initial-preference.diff llu...@novell.com -- Make the default handler for .iso files instead of Ark +Patch0: initial-preference.diff +# PATCH-FIX-OPENSUSE add_mimetypes_bnc661777.diff bnc#661777 ctri...@gmx.net -- Add a few mimetypes to the desktop file for better integration in GNOME +Patch1: add_mimetypes_bnc661777.diff +BuildRoot: %{_tmppath}/%{name}-%{version}-build + +# only needed to patch broken images in the upstream tarball +BuildRequires: ImageMagick +BuildRequires: fdupes +BuildRequires: flac-devel +%if %{with lame} +BuildRequires: libmp3lame-devel +%endif +BuildRequires: libdvdread-devel %if %{with ffmpeg} BuildRequires: libffmpeg-devel %endif +BuildRequires: libkcddb4-devel %if %{with mad} BuildRequires: libmad-devel %endif -%if %{with lame} -BuildRequires: libmp3lame-devel +BuildRequires: libmpcdec-devel +BuildRequires: libmusicbrainz-devel +BuildRequires: libsamplerate-devel +BuildRequires: libsndfile-devel +BuildRequires: libvorbis-devel +BuildRequires: taglib-devel +%if 0%{?suse_version} +BuildRequires: update-desktop-files %endif -Url: http://k3b.sourceforge.net/ -License: GPLv2+ -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: 2.0.2 -Release: 9 -%define rversion %version -# svn.kde.org/home/kde/trunk/extragear/multimedia/k3b -Source0: k3b-%{version}.tar.bz2 -Patch1: initial-preference.diff -Patch3: add_mimetypes_bnc661777.diff -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Requires: /usr/bin/cdrdao +Requires: /usr/bin/cdrecord +Requires: /usr/bin/mkisofs +Requires: /usr/bin/readcd +Requires: dvd+rw-tools %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 +Recommends: normalize +Recommends: sox +Recommends: transcode +Recommends: vcdimager Recommends: %{name}-lang = %{version} +Provides: kde4-k3b = 4.2.2.svn951754 +Obsoletes: kde4-k3b < 4.2.2.svn951754 %description -K3b is a CD burning application that supports Ogg Vorbis, MP3 audio -files, DVD burning, CDDB, and much more. - - - -Authors: --------- - Sebastian Trueg <tr...@informatik.uni-freiburg.de> - Thomas Froescher <tfroesc...@gmx.de> +Featuring a simple, yet powerful graphical interface, k3b provides various +options for burning a CD, DVD, or BD (Blu-ray disc). Various types of optical +projects are supported including (but not limited to) audio and data, video +projects for DVD and VCD, as well as multi-session and mixed-mode discs. k3b +also has the ability to erase re-writeable media and can perform more +complicated tasks such as audiovisual encoding and decoding. %package devel +Summary: Development files for k3b License: GPLv2+ -Summary: A Universal CD and DVD Burning Application -Group: Productivity/Multimedia/CD/Record -Requires: %name = %version +Group: Development/Libraries/C and C++ +Requires: %{name} = %{version} %description devel -K3b is a CD burning application that supports Ogg Vorbis, MP3 audio -files, DVD burning, CDDB, and much more. - - - -Authors: --------- - Sebastian Trueg <tr...@informatik.uni-freiburg.de> - Thomas Froescher <tfroesc...@gmx.de> +This package contain files needed for development with k3b. %lang_package %prep -%setup -q -n k3b-%{version} +%setup -q +%patch0 %patch1 -%patch3 + +# patch image with wrong dimensions - fix rpmlint warning "wrong-icon-size" +pushd src/icons/actions +for f in hi16*.png; do + geom=$(identify -ping "$f"|cut -f3 -d" ") + x=${geom%x*} + y=${geom#*x} + if [ "$x" != "16" -o "$y" != "16" ]; then + if [ "$x" -gt "$y" ]; then + nugeom="${x}x${x}" + grav=south + elif [ "$x" -lt "$y" ]; then + nugeom="${y}x${y}" + grav=center + else + nugeom="" + fi + [ -n "$nugeom" ] && mogrify -extent "$nugeom" -background transparent -gravity "$grav" "$f" + mogrify -scale 16x16 -background transparent "$f" + fi +done +popd %build - %cmake_kde4 -d build -- -DK3B_ENABLE_HAL_SUPPORT=OFF - %make_jobs +export RPM_OPT_FLAGS="%{optflags} -fno-strict-aliasing" + +%cmake_kde4 -d build -- -DK3B_ENABLE_HAL_SUPPORT=OFF +%make_jobs %install - pushd build - %makeinstall - popd - %suse_update_desktop_file k3b DiscBurning - %kde_post_install - rm -rf $RPM_BUILD_ROOT/usr/share/locale/sr@ijekavian - rm -rf $RPM_BUILD_ROOT/usr/share/locale/sr@ijekavianlatin - %find_lang k3b k3b.lang - %find_lang k3bsetup k3b.lang - %find_lang libk3b k3b.lang - %find_lang libk3bdevice k3b.lang - %find_lang kio_videodvd k3b.lang - mkdir -p $RPM_BUILD_ROOT/usr/share/icons/hicolor/scalable/apps +pushd build +%kde4_makeinstall +popd + +%if 0%{?suse_version} +%suse_update_desktop_file -r k3b Qt KDE AudioVideo DiscBurning +%endif + +# Remove unneeded locales +%if 0%{?suse_version} && 0%{?suse_version} < 1140 +rm -rf %{buildroot}%{_datadir}/locale/ast/ +rm -rf %{buildroot}%{_datadir}/locale/csb/ +rm -rf %{buildroot}%{_datadir}/locale/hne/ +rm -rf %{buildroot}%{_datadir}/locale/sr@ijekavian/ +rm -rf %{buildroot}%{_datadir}/locale/sr@ijekavianlatin/ +%endif + +# Fix rpmlint warning "files-duplicate*" +%fdupes -s %{buildroot} + +%find_lang k3b k3b.lang +%find_lang k3bsetup k3b.lang +%find_lang libk3b k3b.lang +%find_lang libk3bdevice k3b.lang +%find_lang kio_videodvd k3b.lang + +%kde_post_install %post /sbin/ldconfig @@ -119,49 +164,45 @@ /usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || : %clean -rm -rf $RPM_BUILD_ROOT - -%files lang -f k3b.lang +rm -rf %{buildroot} %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 -/usr/%_lib/libk3blib.so.* -/usr/%_lib/libk3bdevice.so.* -/usr/%_lib/kde4/libexec/k3bsetuphelper -/usr/share/applications/kde4/k3b.desktop -/usr/share/kde4/apps/k3b -/usr/share/kde4/apps/konqsidebartng/virtual_folders/services/videodvd.desktop -/usr/share/kde4/services/ServiceMenus/k3b_* -/usr/share/kde4/services/k3b*.desktop -/usr/share/kde4/services/kcm_k3b*.desktop -/usr/share/kde4/services/videodvd.protocol -/usr/share/kde4/servicetypes/k3bplugin.desktop -%if %suse_version < 1120 -/usr/share/PolicyKit/policy/org.kde.kcontrol.k3bsetup.policy -%else -/usr/share/polkit-1/actions/org.kde.kcontrol.k3bsetup.policy -%endif -%dir /usr/share/kde4/apps/solid -%dir /usr/share/kde4/apps/solid/actions -/usr/share/kde4/apps/solid/actions/k3b_*.desktop -/usr/share/mime/packages/x-k3b.xml -/usr/share/icons/hicolor/*/apps/k3b.* -%if %suse_version < 1120 -%dir /usr/share/locale/hne -%dir /usr/share/locale/hne/LC_MESSAGES -%endif -/etc/dbus-1/system.d/org.kde.kcontrol.k3bsetup.conf -/usr/share/dbus-1/system-services/org.kde.kcontrol.k3bsetup.service +%defattr(-,root,root,-) +%doc COPYING* ChangeLog FAQ PERMISSIONS README +%{_kde4_bindir}/k3b +%{_kde4_bindir}/k3bsetup +%{_kde4_modulesdir}/k3b*.so +%{_kde4_modulesdir}/kcm_k3b*.so +%{_kde4_modulesdir}/kio_videodvd.so +%{_kde4_libexecdir}/k3bsetuphelper +%{_kde4_libdir}/libk3bdevice.so.* +%{_kde4_libdir}/libk3blib.so.* +%{_kde4_applicationsdir}/k3b.desktop +%doc %{_kde4_htmldir}/en/k3b/ +%{_kde4_iconsdir}/hicolor/*/apps/k3b.* +%{_kde4_appsdir}/k3b/ +%{_kde4_appsdir}/konqsidebartng/virtual_folders/services/videodvd.desktop +%dir %{_kde4_appsdir}/solid +%dir %{_kde4_appsdir}/solid/actions +%{_kde4_appsdir}/solid/actions/k3b_*.desktop +%{_kde4_servicesdir}/ServiceMenus/k3b_*.desktop +%{_kde4_servicesdir}/k3b*.desktop +%{_kde4_servicesdir}/kcm_k3b*.desktop +%{_kde4_servicesdir}/videodvd.protocol +%{_kde4_servicetypesdir}/k3bplugin.desktop +%{_datadir}/mime/packages/x-k3b.xml +%config %{_sysconfdir}/dbus-1/system.d/org.kde.kcontrol.k3bsetup.conf +%{_datadir}/dbus-1/system-services/org.kde.kcontrol.k3bsetup.service +%{_datadir}/polkit-1/actions/org.kde.kcontrol.k3bsetup.policy %files devel -%defattr(-,root,root) -/usr/include/k3b* -/usr/%_lib/libk3blib.so -/usr/%_lib/libk3bdevice.so +%defattr(-,root,root,-) +%{_includedir}/k3b*.h +%{_kde4_libdir}/libk3bdevice.so +%{_kde4_libdir}/libk3blib.so + +%files lang -f k3b.lang +%defattr(-,root,root,-) +%exclude %{_kde4_htmldir}/en/k3b/ %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
