From 69025477413574e14ae40ca6bdb904f5e972d0a7371401e6b3e8dedf84fe991f Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Mon, 21 Jun 2010 16:11:33 +0000 Subject: [PATCH] Accepting request 41686 from GNOME:Apps Copy from GNOME:Apps/gimp based on submit request 41686 from user vuntz OBS-URL: https://build.opensuse.org/request/show/41686 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gimp?expand=0&rev=42 --- gimp.changes | 5 +++++ gimp.spec | 5 ++++- openSUSE.gpl | 19 +++++++++++++++++++ 3 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 openSUSE.gpl diff --git a/gimp.changes b/gimp.changes index a5eb1a1..d7125a6 100644 --- a/gimp.changes +++ b/gimp.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jun 14 12:05:43 CEST 2010 - vuntz@opensuse.org + +- Ship the openSUSE palette so that it's available in GIMP. + ------------------------------------------------------------------- Sun May 23 19:41:18 CEST 2010 - vuntz@opensuse.org diff --git a/gimp.spec b/gimp.spec index d7cebed..228daef 100644 --- a/gimp.spec +++ b/gimp.spec @@ -48,7 +48,7 @@ BuildRequires: update-desktop-files BuildRequires: xorg-x11-libXfixes-devel Url: http://www.gimp.org/ Version: 2.6.8 -Release: 3 +Release: 4 License: GPLv2+ Group: Productivity/Graphics/Bitmap Editors Suggests: AdobeICCProfiles @@ -59,6 +59,8 @@ Requires: gtk2 Summary: The GNU Image Manipulation Program Source: ftp://ftp.gimp.org/pub/gimp/v2.6/%{name}-%{version}.tar.bz2 Source1: macros.gimp +# openSUSE palette file +Source2: openSUSE.gpl # PATCH-FIX-UPSTREAM gimp-new-libpng.patch vuntz@opensuse.org -- Taken from upstream, fix build with recent libpng Patch0: gimp-new-libpng.patch # PATCH-FIX-UPSTREAM gimp-fix-statusbar.patch bnc601712 vuntz@opensuse.org -- Taken from upstream, fix status bar not complete with recent gtk+ @@ -227,6 +229,7 @@ make %{?jobs:-j%jobs} %install %makeinstall +install -D -m 0644 %{S:2} %{buildroot}%{_datadir}/gimp/2.0/palettes %suse_update_desktop_file -N GIMP gimp rm $RPM_BUILD_ROOT%{_libdir}/gimp/2.0/*/*.*a %find_lang gimp20 diff --git a/openSUSE.gpl b/openSUSE.gpl new file mode 100644 index 0000000..8edc8a5 --- /dev/null +++ b/openSUSE.gpl @@ -0,0 +1,19 @@ +GIMP Palette +Name: openSUSE +Columns: 7 +# +252 177 28 Orange Light +255 255 102 Butter Light +145 208 7 Lemon Light +212 196 255 Plum Light + 80 128 255 Sky Light +186 189 182 Dust Light +255 77 77 Blood Light +227 83 2 Orange +178 178 71 Butter + 33 120 8 Lemon + 77 68 102 Plum + 0 0 116 Sky + 46 52 54 Dust +140 0 0 Blood +115 186 37 SUSE Green