diff --git a/.gitignore b/.gitignore index eb9327a..12b3ac5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /switchboard-plug-applications-0.1.1.tar.xz /switchboard-plug-applications-0.1.2.tar.xz +/switchboard-plug-applications-0.1.3.tar.gz diff --git a/00-appdata-unicode-fixes.patch b/00-appdata-unicode-fixes.patch new file mode 100644 index 0000000..e9f1fdc --- /dev/null +++ b/00-appdata-unicode-fixes.patch @@ -0,0 +1,32 @@ +From 22b57f9f5998bddecf29f98d6c7191e3a4eb44f8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Daniel=20For=C3=A9?= +Date: Thu, 7 Jun 2018 07:46:30 -0700 +Subject: [PATCH] Appdata: remove zero-width space + +--- + ...elementary.switchboard-plug-applications.appdata.xml.in | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/data/io.elementary.switchboard-plug-applications.appdata.xml.in b/data/io.elementary.switchboard-plug-applications.appdata.xml.in +index b5ee90e..0cf2a50 100644 +--- a/data/io.elementary.switchboard-plug-applications.appdata.xml.in ++++ b/data/io.elementary.switchboard-plug-applications.appdata.xml.in +@@ -1,11 +1,11 @@ + + +-​ io.elementary.switchboard-plug-applications +-​ io.elementary.switchboard +-​ Applications +-​ Manage default and startup applications +-​ https://elementary.io ++ io.elementary.switchboard-plug-applications ++ io.elementary.switchboard ++ Applications ++ Manage default and startup applications ++ https://elementary.io + https://github.com/elementary/switchboard-plug-applications/issues +-​ CC0-1.0 +-​ GPL-2.0+ ++ CC0-1.0 ++ GPL-2.0+ + diff --git a/sources b/sources index fa52979..54941d9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (switchboard-plug-applications-0.1.2.tar.xz) = 13692674df4d4b25eec343cbd0d098047de425172c263da152af697fc9f2e52d7a15fd0a8fd636c47ca9e0e949534b0f24c1f9194713ec27ea1024251a596a99 +SHA512 (switchboard-plug-applications-0.1.3.tar.gz) = 6c6b7f8bd41fc2ec4dba2ad009865cb826114701a447651411606842c21b9f17978a1d7be5646cc5a1244b216cc45c844053f4e28b9d32ab07d13c01e08c336d diff --git a/switchboard-plug-applications.spec b/switchboard-plug-applications.spec index b45c311..422f117 100644 --- a/switchboard-plug-applications.spec +++ b/switchboard-plug-applications.spec @@ -1,24 +1,31 @@ %global __provides_exclude_from ^%{_libdir}/switchboard/.*\\.so$ +%global appname io.elementary.switchboard-plug-applications + Name: switchboard-plug-applications Summary: Switchboard Applications plug -Version: 0.1.2 -Release: 6%{?dist} +Version: 0.1.3 +Release: 1%{?dist} License: GPLv3+ URL: http://github.com/elementary/%{name} -Source0: https://launchpad.net/%{name}/loki/%{version}/+download/%{name}-%{version}.tar.xz +Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz + +# Upstream patch to remove stray U+200B (zero-width space) chars from appdata +# https://github.com/elementary/switchboard-plug-applications/commit/22b57f9f5998bddecf29f98d6c7191e3a4eb44f8 +Patch0: 00-appdata-unicode-fixes.patch -BuildRequires: cmake BuildRequires: gettext +BuildRequires: libappstream-glib +BuildRequires: meson BuildRequires: vala >= 0.22.0 -BuildRequires: vala-tools BuildRequires: pkgconfig(glib-2.0) >= 2.32 BuildRequires: pkgconfig(granite) BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(switchboard-2.0) +Requires: switchboard%{?_isa} Supplements: switchboard%{?_isa} @@ -28,31 +35,38 @@ that allows the user to manage application settings. %prep -%autosetup +%autosetup -p1 %build -mkdir build && pushd build -%cmake .. -%make_build -popd +%meson +%meson_build %install -pushd build -%make_install -popd +%meson_install %find_lang applications-plug +%check +appstream-util validate-relax --nonet \ + %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml + + %files -f applications-plug.lang +%doc README.md %license COPYING -%{_libdir}/switchboard/personal/pantheon-applications-plug/ +%{_libdir}/switchboard/personal/libapplications.so + +%{_datadir}/metainfo/%{appname}.appdata.xml %changelog +* Fri Jun 08 2018 Fabio Valentini - 0.1.3-1 +- Update to version 0.1.3. + * Fri Feb 09 2018 Fedora Release Engineering - 0.1.2-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild