From b2dde54b926f090a9f2674a9a376822194f7ac46 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Mon, 28 Nov 2016 12:37:19 -0600 Subject: [PATCH] 0.92pre3, Fedora Color Palette. --- .gitignore | 1 + Fedora-Color-Palette.gpl | 14 ++++++++++++++ inkscape.spec | 17 +++++++++++++---- sources | 2 +- 4 files changed, 29 insertions(+), 5 deletions(-) create mode 100644 Fedora-Color-Palette.gpl diff --git a/.gitignore b/.gitignore index 994258f..a8aac41 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ inkscape.tar.bz2 /inkscape-0.92pre0.tar.bz2 /inkscape-0.92pre1.tar.bz2 /inkscape-0.92pre2.tar.bz2 +/inkscape-0.92pre3.tar.bz2 diff --git a/Fedora-Color-Palette.gpl b/Fedora-Color-Palette.gpl new file mode 100644 index 0000000..0a455e2 --- /dev/null +++ b/Fedora-Color-Palette.gpl @@ -0,0 +1,14 @@ +GIMP Palette +Name: Fedora RGB +Columns: 2 +# + 60 110 180 Fedora Blue + 41 65 114 Fedora Dark Blue +219 50 121 Friends Magenta +229 151 40 Features Orange +121 219 50 First Green +160 124 188 Freedom Purple + 0 0 0 Black + 76 76 76 Dark Grey +140 140 140 Grey +222 222 222 Light Grey diff --git a/inkscape.spec b/inkscape.spec index cafe806..46e96c8 100644 --- a/inkscape.spec +++ b/inkscape.spec @@ -1,16 +1,18 @@ Name: inkscape Version: 0.92 -Release: 6.pre2%{?dist} +Release: 7.pre3%{?dist} Summary: Vector-based drawing program using SVG Group: Applications/Productivity -License: GPLv2+ +License: GPLv2+ and CC-BY URL: http://inkscape.sourceforge.net/ #Source0: http://downloads.sourceforge.net/inkscape/%{name}-%{version}.tar.bz2 -Source0: https://inkscape.org/en/gallery/item/9633/inkscape-0.92pre2.tar.bz2 +Source0: https://inkscape.org/en/gallery/item/9633/inkscape-0.92pre3.tar.bz2 # AppData file. Upstream has merged a patch adding an appdata file # after into the 0.92 release branch. Source1: %{name}.appdata.xml +# Fedora Color Palette, GIMP format, CC-BY 3.0 +Source2: Fedora-Color-Palette.gpl # Submitted upstream: https://bugs.launchpad.net/inkscape/+bug/1545769 #Patch0: inkscape-0.48.2-types.patch @@ -100,7 +102,7 @@ graphics in W3C standard Scalable Vector Graphics (SVG) file format. %prep -%setup -qn inkscape-0.92pre2 +%setup -qn inkscape-0.92pre3 #%%patch0 -p1 -b .types #%patch1 -p1 -b .desktop #%%patch2 -p0 -b .wft @@ -144,6 +146,9 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/appdata appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_datadir}/appdata/*.appdata.xml +# Install Fedora Color Pallette +install -pm 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/inkscape/palettes/ + %find_lang %{name} @@ -214,6 +219,10 @@ fi %changelog +* Mon Nov 28 2016 Jon Ciesla - 0.92-7.pre3 +- 0.92pre3. +- Include Fedora Color Palette, BZ 981748 + * Wed Nov 23 2016 David Tardon - 0.92-6.pre2 - rebuild for poppler 0.49.0 diff --git a/sources b/sources index 08b2e36..f68f300 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0f4b9f35aa245627d407ea48c77f2f16 inkscape-0.92pre2.tar.bz2 +ed83c0fa1e9973403e9ca65fc77787cb inkscape-0.92pre3.tar.bz2