Hello community, here is the log from the commit of package k3b for openSUSE:Factory checked in at 2015-11-12 19:40:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/k3b (Old) and /work/SRC/openSUSE:Factory/.k3b.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "k3b" Changes: -------- --- /work/SRC/openSUSE:Factory/k3b/k3b.changes 2015-11-04 15:32:23.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.k3b.new/k3b.changes 2015-11-12 19:40:04.000000000 +0100 @@ -1,0 +2,7 @@ +Fri Nov 6 14:16:44 UTC 2015 - [email protected] + +- Cleanup with spec-cleaner +- Use buildorig syntax instead of with/without conditionals +- Remove icons magic that is not needed anymore + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ k3b.spec ++++++ --- /var/tmp/diff_new_pack.spMW6C/_old 2015-11-12 19:40:05.000000000 +0100 +++ /var/tmp/diff_new_pack.spMW6C/_new 2015-11-12 19:40:05.000000000 +0100 @@ -16,17 +16,12 @@ # -%bcond_with ffmpeg -%bcond_with mad -%bcond_with lame - Name: k3b Version: 2.0.3 Release: 0 Summary: CD/DVD/Blu-ray Burning Application for KDE License: GPL-2.0+ Group: Productivity/Multimedia/CD/Record - Url: http://www.k3b.org/ Source: http://download.kde.org/stable/%{name}/%{name}-%{version}a.tar.xz # PATCH-FIX-OPENSUSE initial-preference.diff [email protected] -- Make the default handler for .iso files instead of Ark @@ -35,52 +30,38 @@ Patch1: building-docs-once-is-enough.patch # PATCH-FIX-UPSTREAM fix-dvd-transcoding.patch kde#350403 -- Fix transcoding of DVD titles Patch2: fix-dvd-transcoding.patch - -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 BuildRequires: libmpcdec-devel BuildRequires: libmusicbrainz-devel BuildRequires: libsamplerate-devel BuildRequires: libsndfile-devel -%if %suse_version > 1200 -BuildRequires: pkgconfig(taglib) -%else -BuildRequires: taglib-devel -%endif BuildRequires: libvorbis-devel -%if 0%{?suse_version} BuildRequires: update-desktop-files -%endif -Requires: /usr/bin/cdrdao -Requires: /usr/bin/cdrecord -Requires: /usr/bin/mkisofs -Requires: /usr/bin/readcd +BuildRequires: pkgconfig(taglib) +Requires: %{_bindir}/cdrdao +Requires: %{_bindir}/cdrecord +Requires: %{_bindir}/mkisofs +Requires: %{_bindir}/readcd Requires: dvd+rw-tools -%kde4_runtime_requires Requires(post): shared-mime-info Requires(postun): shared-mime-info -Recommends: /usr/bin/normalize -Recommends: /usr/bin/sox -Recommends: /usr/bin/transcode -Recommends: vcdimager +Recommends: %{_bindir}/normalize +Recommends: %{_bindir}/sox +Recommends: %{_bindir}/transcode Recommends: %{name}-lang = %{version} +Recommends: vcdimager Provides: kde4-k3b = 4.2.2.svn951754 Obsoletes: kde4-k3b < 4.2.2.svn951754 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +%{kde4_runtime_requires} +%if 0%{?BUILD_ORIG} +BuildRequires: libffmpeg-devel +BuildRequires: libmad-devel +BuildRequires: libmp3lame-devel +%endif %description Featuring a simple, yet powerful graphical interface, k3b provides various @@ -99,55 +80,22 @@ This package contain files needed for development with k3b. %lang_package + %prep -%setup -q -n %{name}-%{version} +%setup -q %patch0 %patch1 -p1 %patch2 -p1 -# 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 -export RPM_OPT_FLAGS="%{optflags} -fno-strict-aliasing" - +CXXFLAGS="%{optflags} -fno-strict-aliasing" %cmake_kde4 -d build -- -DK3B_ENABLE_HAL_SUPPORT=OFF %make_jobs %install %kde4_makeinstall -C build -%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 # symlink solid actions into place known to Plasma 5, remove once k3b is KF5-based mkdir -p %{buildroot}%{_datadir}/solid/actions @@ -157,7 +105,6 @@ done popd -# Fix rpmlint warning "files-duplicate*" %fdupes -s %{buildroot} %find_lang k3b k3b.lang @@ -170,14 +117,13 @@ %post /sbin/ldconfig -/usr/bin/update-mime-database %{_datadir}/mime >/dev/null 2>&1 ||: +%desktop_database_post +%icon_theme_cache_post %postun /sbin/ldconfig -/usr/bin/update-mime-database %{_datadir}/mime >/dev/null 2>&1 ||: - -%clean -rm -rf %{buildroot} +%desktop_database_postun +%icon_theme_cache_postun %files %defattr(-,root,root,-)
