diff --git a/sources b/sources index 68f311a..2b1de3a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xed-1.8.3.tar.gz) = e596e9ead6642e3b5c0798375f39a7f3d4c177edb845ad3b1905f4f3cd71a46b939c0e1ac408daf634f9fb31746ba0ec7e61c073630d1bda7d74396de01102a5 +SHA512 (xed-2.0.0.tar.gz) = 3f8caa54b9347c0a26803982be4297f9390e5be48bfa04d610f4725a2c58446ac5abc842f3958ceaa4300bfb59fc362996baa4edfa8f4af8570b7f1813fc9d27 diff --git a/xed.spec b/xed.spec index 38923f0..7c9ad30 100644 --- a/xed.spec +++ b/xed.spec @@ -7,7 +7,7 @@ Name: xed -Version: 1.8.3 +Version: 2.0.0 Release: 1%{?dist} Summary: X-Apps [Text] Editor (Cross-DE, backward-compatible, GTK3, traditional UI) @@ -15,11 +15,11 @@ License: GPLv2+ URL: https://github.com/linuxmint/%{name} Source0: %url/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz -BuildRequires: autoconf -BuildRequires: automake +BuildRequires: meson BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: gnome-common +BuildRequires: gtk-doc BuildRequires: intltool BuildRequires: libappstream-glib BuildRequires: pkgconfig(enchant) @@ -32,7 +32,7 @@ BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(iso-codes) BuildRequires: python2-gobject-base BuildRequires: pkgconfig(sm) -BuildRequires: pkgconfig(xapp) >= 1.1.0 +BuildRequires: pkgconfig(xapp) >= 1.4.0 BuildRequires: python%{python3_pkgversion}-devel Requires: iso-codes @@ -62,9 +62,7 @@ This package contains files needed to develop plugins for %{name}. %package doc Summary: Documentation files for %{name} - BuildArch: noarch -BuildRequires: gtk-doc %description doc This package contains the documentation files for %{name}. @@ -80,22 +78,17 @@ This package contains the documentation files for %{name}. %{_bindir}/find . -type f -name '*.c' | %{_bindir}/xargs %{__chmod} -c 0644 %{_bindir}/find . -type f -name '*.h' | %{_bindir}/xargs %{__chmod} -c 0644 -NOCONFIGURE=1 %{_bindir}/gnome-autogen.sh - - %build -export PYTHON=%{__python3} -%configure \ - --disable-silent-rules \ - --enable-gtk-doc - -%make_build +%meson \ + -Ddocs=true \ + -Ddeprecated_warnings=false +%meson_build %install -%make_install +%meson_install %{__sed} -i -e '/.*.*/d' \ - %{buildroot}%{_datadir}/appdata/*.appdata.xml + %{buildroot}%{_metainfodir}/%{name}.appdata.xml %{_bindir}/find %{buildroot} -name '*.a' -print -delete %{_bindir}/find %{buildroot} -name '*.la' -print -delete %find_lang %{name} @@ -104,27 +97,11 @@ export PYTHON=%{__python3} %check # Validate desktop-files. %{_bindir}/desktop-file-validate \ - %{buildroot}%{_datadir}/applications/*.desktop + %{buildroot}%{_datadir}/applications/%{name}.desktop # Validate AppData-files. %{_bindir}/appstream-util validate-relax --nonet \ - %{buildroot}%{_datadir}/appdata/*.appdata.xml - - -%if (0%{?rhel} && 0%{?rhel <= 7}) -%post -%{_bindir}/update-desktop-database &> /dev/null || : - -%postun -%{_bindir}/update-desktop-database &> /dev/null || : -if [ $1 -eq 0 ] ; then - %{_bindir}/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : -fi - - -%posttrans -%{_bindir}/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : -%endif # (0%%{?rhel} && 0%%{?rhel <= 7}) + %{buildroot}%{_metainfodir}/%{name}.appdata.xml %files -f %{name}.lang @@ -133,20 +110,19 @@ fi %exclude %{_datadir}/%{name}/gir-1.0 %exclude %{_datadir}/%{name}/gir-1.0/* %{_bindir}/%{name} -%{_datadir}/appdata/%{name}.appdata.xml +%{_metainfodir}/%{name}.appdata.xml %{_datadir}/applications/%{name}.desktop %{_datadir}/dbus-1/services/org.x.editor.*service %{_datadir}/glib-2.0/schemas/org.x.editor.*gschema.xml -%{_datadir}/help/*/%{name} -%{_datadir}/%{name} -%{_libdir}/%{name} -%{_libexecdir}/%{name} +%{_datadir}/help/*/%{name}/ +%{_datadir}/%{name}/ +%{_libdir}/%{name}/ %{_mandir}/man1/%{name}.1* %files devel %{_datadir}/%{name}/gir-1.0 -%{_includedir}/%{name} +%{_includedir}/%{name}/ %{_libdir}/pkgconfig/%{name}.pc @@ -157,6 +133,9 @@ fi %changelog +* Mon Nov 19 2018 Leigh Scott - 2.0.0-1 +- Update to 2.0.0 release + * Wed Aug 15 2018 Leigh Scott - 1.8.3-1 - Update to 1.8.3 release