From e1c091c2358b0d02207420d3dd4629a597735e80 Mon Sep 17 00:00:00 2001 From: Jonathan Underwood Date: Mon, 15 Feb 2016 15:40:33 +0000 Subject: [PATCH] Fix build and move appdata file to separate file - Break appdata file out of spec into its own file - Validate appdata file once installed - Add BuildRequires for libappstream-glib (provides appstream-util) - Remove commented out line in file list - Re-add export CXXFLAGS="%{optflags} -std=c++11" to fix build --- inkscape.appdata.xml | 31 ++++++++++++++++++++++ inkscape.spec | 61 ++++++++++++++------------------------------ 2 files changed, 50 insertions(+), 42 deletions(-) create mode 100644 inkscape.appdata.xml diff --git a/inkscape.appdata.xml b/inkscape.appdata.xml new file mode 100644 index 0000000..1b66314 --- /dev/null +++ b/inkscape.appdata.xml @@ -0,0 +1,31 @@ + + + + + inkscape.desktop + CC0-1.0 + +

+ An Open Source vector graphics editor, with capabilities similar to Illustrator, + CorelDraw, or Xara X, using the W3C standard Scalable Vector Graphics (SVG) file + format. +

+

+ Inkscape supports many advanced SVG features (markers, clones, alpha blending, + etc.) and great care is taken in designing a streamlined interface. It is very + easy to edit nodes, perform complex path operations, trace bitmaps and much more. + We also aim to maintain a thriving user and developer community by using open, + community-oriented development. +

+ + http://inkscape.org/ + + https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/inkscape/a.png + + + diff --git a/inkscape.spec b/inkscape.spec index f73c356..a31ba68 100644 --- a/inkscape.spec +++ b/inkscape.spec @@ -1,12 +1,16 @@ Name: inkscape Version: 0.91 -Release: 22%{?dist} +Release: 23%{?dist} Summary: Vector-based drawing program using SVG Group: Applications/Productivity License: GPLv2+ URL: http://inkscape.sourceforge.net/ Source0: http://downloads.sourceforge.net/inkscape/%{name}-%{version}.tar.bz2 +# AppData file. This has been submitted upstream: +# https://bugs.launchpad.net/inkscape/+bug/1545754 +Source1: %{name}.appdata.xml + Patch0: inkscape-0.48.2-types.patch Patch1: inkscape-0.91-desktop.patch @@ -34,6 +38,7 @@ BuildRequires: pkgconfig BuildRequires: python-devel BuildRequires: poppler-glib-devel BuildRequires: popt-devel +BuildRequires: libappstream-glib # Disable all for now. TODO: Be smarter %if 0 @@ -101,6 +106,9 @@ find share/extensions -name '*.py' | xargs chmod -x dos2unix -k -q share/extensions/*.py %build +# This is still needed with gcc6 until this is fixed: +# https://bugs.launchpad.net/inkscape/+bug/1488079 +export CXXFLAGS="%{optflags} -std=c++11" %configure \ --with-python \ --with-perl \ @@ -121,47 +129,10 @@ desktop-file-install --vendor="%{?desktop_vendor}" --delete-original \ # No skencil anymore rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/extensions/sk2svg.sh -# Register as an application to be visible in the software center -# -# NOTE: It would be *awesome* if this file was maintained by the upstream -# project, translated and installed into the right place during `make install`. -# -# See http://www.freedesktop.org/software/appstream/docs/ for more details. -# +# Install and validate appdata file mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata -cat > $RPM_BUILD_ROOT%{_datadir}/appdata/%{name}.appdata.xml < - - - - inkscape.desktop - CC0-1.0 - -

- An Open Source vector graphics editor, with capabilities similar to Illustrator, - CorelDraw, or Xara X, using the W3C standard Scalable Vector Graphics (SVG) file - format. -

-

- Inkscape supports many advanced SVG features (markers, clones, alpha blending, - etc.) and great care is taken in designing a streamlined interface. It is very - easy to edit nodes, perform complex path operations, trace bitmaps and much more. - We also aim to maintain a thriving user and developer community by using open, - community-oriented development. -

- - http://inkscape.org/ - - https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/inkscape/a.png - - - -EOF +cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/appdata +appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_datadir}/appdata/*.appdata.xml %find_lang %{name} @@ -194,7 +165,6 @@ fi %dir %{_datadir}/inkscape %{_datadir}/inkscape/attributes %{_datadir}/inkscape/branding -#%{_datadir}/inkscape/clipart %{_datadir}/inkscape/extensions # Pulls in perl, if needed should go into a -perl subpackage %exclude %{_datadir}/inkscape/extensions/embed_raster_in_svg.pl @@ -233,6 +203,13 @@ fi %changelog +* Mon Feb 15 2016 Jonathan Underwood - 0.91-23 +- Break appdata file out of spec into its own file +- Validate appdata file once installed +- Add BuildRequires for libappstream-glib (provides appstream-util) +- Remove commented out line in file list +- Re-add export CXXFLAGS="%{optflags} -std=c++11" to fix build + * Mon Feb 15 2016 Jonathan Underwood - 0.91-22 - Drop --disable-strict-build since this is fixed: https://bugzilla.gnome.org/show_bug.cgi?id=752797