From da55a3212044dcb4ab1ff99059820658d0974cef Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Oct 30 2018 04:56:59 +0000 Subject: import gnome-dictionary-3.26.1-2.el7 --- diff --git a/.gitignore b/.gitignore index f542775..bb3cf6b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/gnome-dictionary-3.20.0.tar.xz +SOURCES/gnome-dictionary-3.26.1.tar.xz diff --git a/.gnome-dictionary.metadata b/.gnome-dictionary.metadata index a79bedb..8ab9499 100644 --- a/.gnome-dictionary.metadata +++ b/.gnome-dictionary.metadata @@ -1 +1 @@ -50a7c5a5fb1da84d52e380d1c5cd80d9f6971cc6 SOURCES/gnome-dictionary-3.20.0.tar.xz +e80a4d7a7aad4a37b92e8b168d47145be83987d9 SOURCES/gnome-dictionary-3.26.1.tar.xz diff --git a/SPECS/gnome-dictionary.spec b/SPECS/gnome-dictionary.spec index c074313..7af7198 100644 --- a/SPECS/gnome-dictionary.spec +++ b/SPECS/gnome-dictionary.spec @@ -1,67 +1,47 @@ -Summary: A dictionary application for GNOME -Name: gnome-dictionary -Version: 3.20.0 -Release: 1%{?dist} -License: GPLv3+ and LGPLv2+ and GFDL -Group: Applications/Text -#VCS: git:git://git.gnome.org/gnome-dictionary -Source: https://download.gnome.org/sources/%{name}/3.20/%{name}-%{version}.tar.xz -URL: https://wiki.gnome.org/Apps/Dictionary - -BuildRequires: pkgconfig(gobject-introspection-1.0) -BuildRequires: pkgconfig(gtk+-3.0) -BuildRequires: intltool -BuildRequires: itstool -BuildRequires: desktop-file-utils -BuildRequires: docbook-dtds -BuildRequires: /usr/bin/appstream-util - -Requires: %{name}-libs%{?_isa} = %{version}-%{release} +Name: gnome-dictionary +Version: 3.26.1 +Release: 2%{?dist} +Summary: A dictionary application for GNOME + +License: GPLv3+ and LGPLv2+ and GFDL +URL: https://wiki.gnome.org/Apps/Dictionary +Source0: https://download.gnome.org/sources/%{name}/3.26/%{name}-%{version}.tar.xz + +BuildRequires: desktop-file-utils +BuildRequires: docbook-style-xsl +BuildRequires: gettext +BuildRequires: itstool +BuildRequires: meson +BuildRequires: pkgconfig(gobject-introspection-1.0) +BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: /usr/bin/appstream-util +BuildRequires: /usr/bin/xsltproc Obsoletes: gnome-utils <= 1:3.3 Obsoletes: gnome-utils-libs <= 1:3.3 Obsoletes: gnome-utils-devel <= 1:3.3 +# Removed in F27 +Obsoletes: gnome-dictionary-devel < 3.26.0 +Obsoletes: gnome-dictionary-libs < 3.26.0 %description gnome-dictionary lets you look up words in dictionary sources. -%package libs -Summary: Library for dictionary support -License: LGPLv2+ - -%description libs -This package contains the libgdict library. - -%package devel -Summary: Development files for using libgdict -Group: Development/Libraries -Requires: %{name}%{?_isa} = %{version}-%{release} - -%description devel -gnome-dictionary-devel contains header files and others that -are needed to build applications using the libgdict library. - %prep %setup -q %build -%configure -make %{_smp_mflags} +%meson +%meson_build %install -%make_install -rm -f $RPM_BUILD_ROOT%{_libdir}/*.la +%meson_install %find_lang %{name} --with-gnome - %check appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_datadir}/appdata/*.appdata.xml desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop - -%post libs -p /sbin/ldconfig -%postun libs -p /sbin/ldconfig - %postun if [ $1 -eq 0 ]; then glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : @@ -70,31 +50,22 @@ fi %posttrans glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : -%files -%doc NEWS AUTHORS README +%files -f %{name}.lang +%doc NEWS README.md %license COPYING COPYING.docs COPYING.libs %{_bindir}/gnome-dictionary %{_datadir}/appdata/org.gnome.Dictionary.appdata.xml %{_datadir}/applications/org.gnome.Dictionary.desktop %{_datadir}/dbus-1/services/org.gnome.Dictionary.service +%{_datadir}/gdict-1.0/ %{_datadir}/glib-2.0/schemas/org.gnome.dictionary.gschema.xml %{_mandir}/man1/gnome-dictionary.1* -%files libs -f %{name}.lang -%license COPYING.libs -%{_libdir}/girepository-1.0/Gdict-1.0.typelib -%{_libdir}/libgdict-1.0.so.* -%{_datadir}/gdict-1.0/ - -%files devel -%{_includedir}/gdict-1.0/ -%{_libdir}/libgdict-1.0.so -%{_libdir}/pkgconfig/gdict-1.0.pc -%{_datadir}/gir-1.0/Gdict-1.0.gir -%{_datadir}/gtk-doc/html/gdict - - %changelog +* Sun Oct 08 2017 Kalev Lember - 3.26.1-1 +- Update to 3.26.1 +- Resolves: #1568169 + * Wed Feb 22 2017 Matthias Clasen - 3.20.0-1 - Rebase to 3.20.0 Resolves: rhbz#1386890