- updated to 3.32.1

diff --git a/gnome-characters.spec b/gnome-characters.spec
index acd4fcdac99e16b23ad305e417bdac8cb47fc1aa..8300da3e49adfec86b3ca4342cda204fd4d3151f 100644 (file)
--- a/gnome-characters.spec
+++ b/gnome-characters.spec
@@ -1,33 +1,29 @@
 Summary:       Character Map application for GNOME
 Summary(pl.UTF-8):     Mapa znaków dla GNOME
 Name:          gnome-characters
-Version:       3.24.0
+Version:       3.32.1
 Release:       1
 License:       GPL v2+ with BSD parts
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnome-characters/3.24/%{name}-%{version}.tar.xz
-# Source0-md5: 358a673bf50ad08915fba603975ae0c9
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnome-characters/3.32/%{name}-%{version}.tar.xz
+# Source0-md5: 402cb7ff71f4b9181a7ddb7c2862efe5
 URL:           https://wiki.gnome.org/Design/Apps/CharacterMap
-BuildRequires: appstream-glib-devel
-BuildRequires: autoconf >= 2.63
-BuildRequires: automake >= 1:1.12
-BuildRequires: gdk-pixbuf2-devel >= 2.0
 BuildRequires: gettext-tools >= 0.19.8
-BuildRequires: gjs-devel >= 1.43.3
+BuildRequires: gjs-devel >= 1.50
 BuildRequires: glib2-devel >= 1:2.26.0
 BuildRequires: gobject-introspection-devel >= 1.36.0
 BuildRequires: gtk+3-devel >= 3.0
-BuildRequires: libtool >= 2:2
 BuildRequires: libunistring-devel >= 0.9.6
+BuildRequires: meson >= 0.46.0
+BuildRequires: ninja >= 1.5
 BuildRequires: pango-devel
 BuildRequires: pkgconfig >= 1:0.22
 BuildRequires: tar >= 1:1.22
 BuildRequires: xz
 Requires(post,postun): gtk-update-icon-cache
 Requires(post,postun): glib2 >= 1:2.26.0
-Requires:      gjs >= 1.43.3
+Requires:      gjs >= 1.50
 Requires:      glib2 >= 1:2.26.0
-Requires:      gnome-icon-theme-symbolic
 Requires:      hicolor-icon-theme
 Requires:      libunistring >= 0.9.6
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -44,51 +40,41 @@ i wstawiać rzadko używane znaki.
 %setup -q
 
 %build
-%{__libtoolize}
-%{__aclocal} -I m4 -I glm4
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
-       --disable-silent-rules
+%meson build
 
-%{__make}
+%ninja_build -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT
-
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/org.gnome.Characters/*.la
+%ninja_install -C build
 
 %find_lang org.gnome.Characters
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 %glib_compile_schemas
-%update_icon_cache gnome
 %update_icon_cache hicolor
 
 %postun
 %glib_compile_schemas
-%update_icon_cache gnome
 %update_icon_cache hicolor
 
 %files -f org.gnome.Characters.lang
 %defattr(644,root,root,755)
-%doc COPYING NEWS README
+%doc COPYING NEWS README.md
 %attr(755,root,root) %{_bindir}/gnome-characters
 %dir %{_libdir}/org.gnome.Characters
 %attr(755,root,root) %{_libdir}/org.gnome.Characters/libgc.so
 %dir %{_libdir}/org.gnome.Characters/girepository-1.0
 %{_libdir}/org.gnome.Characters/girepository-1.0/Gc-1.0.typelib
-%{_datadir}/appdata/org.gnome.Characters.appdata.xml
 %{_datadir}/dbus-1/services/org.gnome.Characters.service
 %{_datadir}/dbus-1/services/org.gnome.Characters.BackgroundService.service
 %{_datadir}/glib-2.0/schemas/org.gnome.Characters.gschema.xml
 %{_datadir}/gnome-shell/search-providers/org.gnome.Characters.search-provider.ini
+%{_datadir}/metainfo/org.gnome.Characters.appdata.xml
 %dir %{_datadir}/org.gnome.Characters
 %attr(755,root,root) %{_datadir}/org.gnome.Characters/org.gnome.Characters
 %attr(755,root,root) %{_datadir}/org.gnome.Characters/org.gnome.Characters.BackgroundService
@@ -96,6 +82,5 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/org.gnome.Characters/gir-1.0
 %{_datadir}/org.gnome.Characters/gir-1.0/Gc-1.0.gir
 %{_desktopdir}/org.gnome.Characters.desktop
-%{_iconsdir}/hicolor/*x*/apps/gnome-characters.png
-%{_iconsdir}/hicolor/scalable/categories/characters-*-symbolic.svg
-%{_iconsdir}/hicolor/symbolic/apps/gnome-characters-symbolic.svg
+%{_iconsdir}/hicolor/scalable/apps/org.gnome.Characters.svg
+%{_iconsdir}/hicolor/symbolic/apps/org.gnome.Characters-symbolic.svg