diff --git a/4_6_BRANCH.diff b/4_6_BRANCH.diff deleted file mode 100644 index 50240df..0000000 --- a/4_6_BRANCH.diff +++ /dev/null @@ -1,7 +0,0 @@ -package: kdegraphics-4.4.3.tar.bz2 -kdemod: kdegraphics ---- BRANCH_STATUS -+++ BRANCH_STATUS -@@ -0,0 +1,2 @@ -+current HEAD: 1127686 -+svn di between //tags/KDE/4.4.3/kdegraphics and //branches/KDE/4.4/kdegraphics diff --git a/kolourpaint-4.6.95.tar.bz2 b/kolourpaint-4.6.95.tar.bz2 deleted file mode 100644 index 6e364b1..0000000 --- a/kolourpaint-4.6.95.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c655a23cf537428f19946884c515a33be3e34bca056eefcee9e8d8d2cb167a0a -size 1238573 diff --git a/kolourpaint-4.7.0.tar.bz2 b/kolourpaint-4.7.0.tar.bz2 new file mode 100644 index 0000000..edcacdd --- /dev/null +++ b/kolourpaint-4.7.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9a999b549d75ce252a66d16e100625976fd99c15eca0dad5a42261551dfa7832 +size 1238484 diff --git a/kolourpaint.changes b/kolourpaint.changes index b0fa164..921a56f 100644 --- a/kolourpaint.changes +++ b/kolourpaint.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Tue Jul 26 10:14:10 UTC 2011 - cdenicolo@novell.com + +- license update: BSD2c + PacPackage is licensed under BSD. + +------------------------------------------------------------------- +Fri Jul 22 20:25:19 CEST 2011 - dmueller@suse.de + +- update to 4.7.0 + * Small fixes over KDE 4.7 RC2 + * see http://kde.org/announcements/4.7 for details + + ------------------------------------------------------------------- Sat Jul 9 09:58:52 CEST 2011 - dmueller@suse.de diff --git a/kolourpaint.spec b/kolourpaint.spec index 4ba307c..ff4ddca 100644 --- a/kolourpaint.spec +++ b/kolourpaint.spec @@ -18,19 +18,18 @@ Name: kolourpaint +Version: 4.7.0 +Release: 1 +License: BSD2c +Summary: Paint Program +Url: http://www.kde.org +Group: Productivity/Graphics/Bitmap Editors +Source0: %{name}-%{version}.tar.bz2 BuildRequires: libkde4-devel BuildRequires: libqimageblitz-devel BuildRequires: oxygen-icon-theme-large -License: GPLv2+ -Group: Productivity/Graphics/Bitmap Editors -Summary: Paint Program Provides: kde4-kolourpaint = 4.3.0 Obsoletes: kde4-kolourpaint < 4.3.0 -Url: http://www.kde.org -Version: 4.6.95 -Release: 1 -Source0: %{name}-%version.tar.bz2 -Patch0: 4_6_BRANCH.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %kde4_runtime_requires @@ -38,8 +37,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Paint program for KDE %prep -%setup -q -n %{name}-%version -%patch0 +%setup -q -n %{name}-%{version} %build %cmake_kde4 -d build @@ -47,7 +45,7 @@ Paint program for KDE %install cd build - %makeinstall +%make_install %suse_update_desktop_file kolourpaint RasterGraphics %kde_post_install @@ -56,15 +54,15 @@ Paint program for KDE %postun -p /sbin/ldconfig %clean - rm -rf $RPM_BUILD_ROOT + rm -rf %{buildroot} -%files +%files %defattr(-,root,root) %doc COPYING README %_kde4_bindir/kolourpaint %_kde4_libdir/libkolourpaint_lgpl.so* %_kde4_applicationsdir/kolourpaint.desktop -%_datadir/icons/hicolor/*/apps/kolourpaint.* +%{_datadir}/icons/hicolor/*/apps/kolourpaint.* %_kde4_appsdir/kolourpaint/ %_kde4_htmldir/en/kolourpaint/