From 4dbb7a083c6a115f8a1f060a4228026294154806 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Dec 08 2015 16:44:35 +0000 Subject: 15.08.3-2 - relax deps, kde4 versions won't be changing much anymore - .spec cosmetics - -doc subpkg (separate licensing, easier multilib workaround for conflicts) --- diff --git a/audiocd-kio.spec b/audiocd-kio.spec index 5f9107b..a57dd39 100644 --- a/audiocd-kio.spec +++ b/audiocd-kio.spec @@ -1,11 +1,11 @@ Name: audiocd-kio Summary: Audiocd kio slave Version: 15.08.3 -Release: 1%{?dist} +Release: 2%{?dist} # code GPLv2+, handbook/docs GFDL -License: GPLv2+ and GFDL -URL: https://projects.kde.org/projects/kde/kdemultimedia/%{name} +License: GPLv2+ +URL: https://projects.kde.org/audiocd-kio %global revision %(echo %{version} | cut -d. -f3) %if %{revision} >= 50 %global stable unstable @@ -18,8 +18,8 @@ Source0: http://download.kde.org/%{stable}/applications/%{version}/src/%{name}-% BuildRequires: cdparanoia-devel cdparanoia BuildRequires: kdelibs4-devel >= 4.14 -BuildRequires: libkcddb-devel >= %{version} -BuildRequires: libkcompactdisc-devel >= %{version} +BuildRequires: libkcddb-devel +BuildRequires: libkcompactdisc-devel BuildRequires: pkgconfig(flac) BuildRequires: pkgconfig(phonon) BuildRequires: pkgconfig(theora) @@ -33,6 +33,11 @@ Obsoletes: kdemultimedia-kio_audiocd < 6:4.8.80 Provides: kdemultimedia-kio_audiocd = 6:%{version}-%{release} Provides: kio_audiocd = %{version}-%{release} +## when -docs landed +## can skip Obsoletes due to circular Requires (hopefully) -- rex +#Obsoletes: audiocd-kio < 15.08.3-2 +Requires: audiocd-kio-doc = %{version}-%{release} + %description %{summary}. @@ -40,8 +45,6 @@ Provides: kio_audiocd = %{version}-%{release} Summary: Runtime libraries for %{name} Requires: %{name} = %{version}-%{release} %{?kdelibs4_requires} -Requires: libkcddb%{?_isa}%{?_kde4_version: >= %{_kde4_version}} -Requires: libkcompactdisc%{?_isa}%{?_kde4_version: >= %{_kde4_version}} # when split occurred Conflicts: kdemultimedia-libs < 6:4.8.80 %description libs @@ -56,13 +59,23 @@ Conflicts: kdemultimedia-devel < 6:4.8.80 %description devel %{summary}. +%package doc +Summary: Documentation for %{name} +License: GFDL +## can skip Obsoletes due to circular Requires (hopefully) -- rex +#Obsoletes: audiocd-kio < 15.08.3-2 +Requires: audiocd-kio-doc = %{version}-%{release} +BuildArch: noarch +%description doc +Documentation for %{name}. + %prep %setup -q %build -mkdir -p %{_target_platform} +mkdir %{_target_platform} pushd %{_target_platform} %{cmake_kde4} .. popd @@ -73,8 +86,6 @@ make %{?_smp_mflags} -C %{_target_platform} %install make install/fast DESTDIR=%{buildroot} -C %{_target_platform} -%find_lang %{name} --with-kde --all-name - # fix documentation multilib conflict in index.cache bunzip2 %{buildroot}%{_kde4_docdir}/HTML/en/kioslave/audiocd/index.cache.bz2 sed -i -e 's!name="id[a-z]*[0-9]*"!!g' %{buildroot}%{_kde4_docdir}/HTML/en/kioslave/audiocd/index.cache @@ -82,11 +93,8 @@ sed -i -e 's!#id[a-z]*[0-9]*"!!g' %{buildroot}%{_kde4_docdir}/HTML/en/kioslave/a bzip2 -9 %{buildroot}%{_kde4_docdir}/HTML/en/kioslave/audiocd/index.cache -#check - - -%files -f %{name}.lang -%doc COPYING COPYING.DOC +%files +%license COPYING # own these to avoid dep on kdebase %dir %{_kde4_appsdir}/konqsidebartng/ %dir %{_kde4_appsdir}/konqsidebartng/virtual_folders/ @@ -113,8 +121,18 @@ bzip2 -9 %{buildroot}%{_kde4_docdir}/HTML/en/kioslave/audiocd/index.cache %{_kde4_includedir}/audiocdencoder.h %{_kde4_libdir}/libaudiocdplugins.so +%files doc +%license COPYING.DOC +%lang(en) %{_kde4_docdir}/HTML/en/kioslave/audiocd/ + + %changelog +* Tue Dec 08 2015 Rex Dieter - 15.08.3-2 +- relax deps, kde4 versions won't be changing much anymore +- .spec cosmetics +- -doc subpkg (separate licensing, easier multilib workaround for conflicts) + * Sat Dec 05 2015 Rex Dieter - 15.08.3-1 - 15.08.3