From 78abefbaffe6913ab4441bc46891693d5b70d80e88ed29bf735137ffc9badc5a Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sat, 28 Mar 2020 12:10:17 +0000 Subject: [PATCH] Accepting request 785253 from home:polslinux:branches:GNOME:Factory - Update to 13.0.0 (no changelog) - Switch to _service and _servicedata because tarball wasn't released - Switch to meson OBS-URL: https://build.opensuse.org/request/show/785253 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gucharmap?expand=0&rev=162 --- _service | 14 ++++++++++++++ _servicedata | 4 ++++ gucharmap-12.0.1.tar.xz | 3 --- gucharmap-13.0.0.tar.gz | 3 +++ gucharmap.changes | 7 +++++++ gucharmap.spec | 35 +++++++++++++++++------------------ 6 files changed, 45 insertions(+), 21 deletions(-) create mode 100644 _service create mode 100644 _servicedata delete mode 100644 gucharmap-12.0.1.tar.xz create mode 100644 gucharmap-13.0.0.tar.gz diff --git a/_service b/_service new file mode 100644 index 0000000..9d0ba2d --- /dev/null +++ b/_service @@ -0,0 +1,14 @@ + + + https://gitlab.gnome.org/GNOME/gucharmap.git + git + .git + 13.0.0 + @PARENT_TAG@ + enable + + + *.tar + gz + + diff --git a/_servicedata b/_servicedata new file mode 100644 index 0000000..01728fb --- /dev/null +++ b/_servicedata @@ -0,0 +1,4 @@ + + + https://gitlab.gnome.org/GNOME/gucharmap.git + fb6bc29bbecbe30debabc195d1342d981f8f3a6b diff --git a/gucharmap-12.0.1.tar.xz b/gucharmap-12.0.1.tar.xz deleted file mode 100644 index 2f27e1f..0000000 --- a/gucharmap-12.0.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:39de8aad9d7f0af33c29db1a89f645e76dad2fce00d1a0f7c8a689252a2c2155 -size 1678524 diff --git a/gucharmap-13.0.0.tar.gz b/gucharmap-13.0.0.tar.gz new file mode 100644 index 0000000..2ffc977 --- /dev/null +++ b/gucharmap-13.0.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c77089d1fe7661fffb67e099a618d7d28497cbfe52f7f4976cf1f56b5b64af29 +size 1914328 diff --git a/gucharmap.changes b/gucharmap.changes index 5837b5f..9c0837a 100644 --- a/gucharmap.changes +++ b/gucharmap.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Mar 15 10:35:19 UTC 2020 - Paolo Stivanin + +- Update to 13.0.0 (no changelog) +- Switch to _service and _servicedata because tarball wasn't released +- Switch to meson + ------------------------------------------------------------------- Sat Jan 25 14:15:07 UTC 2020 - Dominique Leuenberger diff --git a/gucharmap.spec b/gucharmap.spec index 5bcc6c0..6973ef0 100644 --- a/gucharmap.spec +++ b/gucharmap.spec @@ -1,7 +1,7 @@ # # spec file for package gucharmap # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,14 +21,13 @@ %define so_gucharmap 7 %define pc_api 2.90 Name: gucharmap -Version: 12.0.1 +Version: 13.0.0 Release: 0 Summary: A Featureful Unicode Character Map License: GPL-3.0-or-later AND LGPL-2.1-or-later Group: System/GUI/GNOME URL: https://wiki.gnome.org/Apps/Gucharmap -Source0: https://download.gnome.org/sources/gucharmap/12.0/%{name}-%{version}.tar.xz - +Source0: %{name}-%{version}.tar.gz BuildRequires: appdata-tools BuildRequires: fdupes BuildRequires: gettext @@ -36,12 +35,14 @@ BuildRequires: gobject-introspection-devel >= 0.9.0 BuildRequires: gtk-doc BuildRequires: gtk3-devel >= 3.4.0 BuildRequires: intltool +BuildRequires: meson >= 0.50.0 BuildRequires: pkgconfig BuildRequires: translation-update-upstream BuildRequires: unicode-ucd BuildRequires: unicode-ucd-unihan BuildRequires: unzip BuildRequires: update-desktop-files +BuildRequires: vala BuildRequires: yelp-tools BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(gio-2.0) >= 2.32.0 @@ -84,19 +85,17 @@ to develop applications that require these. %prep %setup -q -translation-update-upstream +translation-update-upstream po %{name} %build export LIBS="-ldl" -%configure --disable-static \ - --enable-gtk-doc \ - --with-gtk=3.0 \ - --with-unicode-data=%{_datadir}/unicode/ucd \ - --enable-introspection -make %{?_smp_mflags} +%meson \ + -Ducd_path=%{_datadir}/unicode/ucd \ + %{nil} +%meson_build %install -%make_install +%meson_install find %{buildroot} -type f -name "*.la" -delete -print %find_lang %{name} %{?no_lang_C} # We need X-SuSE-Editor to avoid an error for the categories check. We don't @@ -108,17 +107,14 @@ find %{buildroot} -type f -name "*.la" -delete -print %postun -n libgucharmap%{so_api}-%{so_gucharmap} -p /sbin/ldconfig %files -%license COPYING -%doc ChangeLog NEWS -%{_bindir}/charmap -%{_bindir}/gnome-character-map +%license COPYING COPYING.GFDL COPYING.UNICODE +%doc README.md %{_bindir}/gucharmap %{_datadir}/applications/gucharmap.desktop -%{_datadir}/glib-2.0/schemas/org.gnome.Charmap.enums.xml %{_datadir}/glib-2.0/schemas/org.gnome.Charmap.gschema.xml %doc %{_datadir}/help/C/gucharmap/ %dir %{_datadir}/metainfo -%{_datadir}/metainfo/gucharmap.appdata.xml +%{_datadir}/metainfo/gucharmap.metainfo.xml %files -n libgucharmap%{so_api}-%{so_gucharmap} %{_libdir}/libgucharmap%{so_api}.so.%{so_gucharmap}* @@ -133,6 +129,9 @@ find %{buildroot} -type f -name "*.la" -delete -print %{_libdir}/libgucharmap%{so_api}.so %{_libdir}/pkgconfig/gucharmap-%{pc_api}.pc %{_datadir}/gir-1.0/Gucharmap-%{pc_api}.gir +%dir %{_datadir}/vala/vapi +%{_datadir}/vala/vapi/gucharmap-2.90.deps +%{_datadir}/vala/vapi/gucharmap-2.90.vapi %doc %{_datadir}/gtk-doc/html/gucharmap-%{pc_api}/ %changelog