diff --git a/.gitignore b/.gitignore index c3e1411..7c6f8d1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,13 +1 @@ -/kolourpaint-4.14.0.tar.xz -/kolourpaint-4.14.1.tar.xz -/kolourpaint-4.14.2.tar.xz -/kolourpaint-4.14.3.tar.xz -/kolourpaint-14.12.1.tar.xz -/kolourpaint-14.12.2.tar.xz -/kolourpaint-14.12.3.tar.xz -/kolourpaint-15.04.0.tar.xz -/kolourpaint-15.04.1.tar.xz -/kolourpaint-15.04.2.tar.xz -/kolourpaint-15.08.0.tar.xz -/kolourpaint-15.08.3.tar.xz /kolourpaint-15.12.1.tar.xz diff --git a/kolourpaint.spec b/kolourpaint.spec index 5a20d40..d95dbe6 100644 --- a/kolourpaint.spec +++ b/kolourpaint.spec @@ -1,10 +1,10 @@ Name: kolourpaint Summary: An easy-to-use paint program Version: 15.12.1 -Release: 2%{?dist} +Release: 3%{?dist} License: BSD -URL: https://projects.kde.org/projects/kde/kdegraphics/kolourpaint +URL: https://projects.kde.org/kolourpaint %global revision %(echo %{version} | cut -d. -f3) %if %{revision} >= 50 %global stable unstable @@ -18,6 +18,7 @@ BuildRequires: kdelibs4-devel >= 4.14 %if 0%{?fedora} > 19 BuildRequires: libappstream-glib %endif +BuildRequires: pkgconfig(libksane) BuildRequires: pkgconfig(qimageblitz) Requires: %{name}-libs%{?_isa} = %{version}-%{release} @@ -37,11 +38,11 @@ License: LGPLv2 %prep -%setup +%setup -q %build -mkdir -p %{_target_platform} +mkdir %{_target_platform} pushd %{_target_platform} %{cmake_kde4} .. popd @@ -52,7 +53,9 @@ make %{?_smp_mflags} -C %{_target_platform} %install make install/fast DESTDIR=%{buildroot} -C %{_target_platform} -%find_lang %{name} --with-kde --without-mo +mv -fv \ + %{buildroot}%{_kde4_datadir}/appdata/org.kde.%{name}.appdata.xml \ + %{buildroot}%{_kde4_datadir}/appdata/%{name}.appdata.xml ||: ## unpackaged files rm -fv %{buildroot}%{_kde4_libdir}/libkolourpaint_lgpl.so @@ -76,13 +79,15 @@ touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || : gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || : fi -%files -f %{name}.lang -%doc AUTHORS BUGS ChangeLog COPYING NEWS README +%files +%doc AUTHORS BUGS ChangeLog NEWS README +%license COPYING* %{_kde4_bindir}/%{name} %{_kde4_appsdir}/%{name}/ %{_kde4_datadir}/appdata/%{name}.appdata.xml %{_kde4_datadir}/applications/kde4/%{name}.desktop %{_kde4_iconsdir}/hicolor/*/*/* +%lang(en) %{_kde4_docdir}/HTML/en/%{name}/ %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig @@ -92,6 +97,9 @@ fi %changelog +* Thu Feb 04 2016 Rex Dieter 15.12.1-3 +- cleanup, use %%license, BR: libksane + * Thu Feb 04 2016 Fedora Release Engineering - 15.12.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild