commit df25b7184606c935a7e0ec65471038c221425cfa
Author: Jakub Bogusz <[email protected]>
Date: Tue Nov 26 20:45:17 2019 +0100
- updated to 3.26.1; libgdict is now internal library
gnome-dictionary.spec | 134 ++++++++------------------------------------------
1 file changed, 21 insertions(+), 113 deletions(-)
---
diff --git a/gnome-dictionary.spec b/gnome-dictionary.spec
index 73b0299..fc593f0 100644
--- a/gnome-dictionary.spec
+++ b/gnome-dictionary.spec
@@ -1,30 +1,24 @@
-#
-# Conditional build:
-%bcond_without static_libs # static library
-
Summary: Online dictionary
Summary(pl.UTF-8): Słownik online
Name: gnome-dictionary
-Version: 3.24.1
+Version: 3.26.1
Release: 1
Epoch: 1
License: GPL v2+
Group: X11/Applications
-Source0:
http://ftp.gnome.org/pub/GNOME/sources/gnome-dictionary/3.24/%{name}-%{version}.tar.xz
-# Source0-md5: dae37a5ac615e223bd2fe6a4adf04423
+Source0:
http://ftp.gnome.org/pub/GNOME/sources/gnome-dictionary/3.26/%{name}-%{version}.tar.xz
+# Source0-md5: 08be36dd1c6d8d4e23a744737519d546
URL: https://wiki.gnome.org/Apps/Dictionary
-BuildRequires: autoconf >= 2.63
-BuildRequires: automake >= 1:1.14
BuildRequires: gettext-tools >= 0.17
BuildRequires: glib2-devel >= 1:2.42.0
BuildRequires: gobject-introspection-devel >= 1.42.0
BuildRequires: gtk+3-devel >= 3.22
BuildRequires: gtk-doc >= 1.15
-BuildRequires: intltool >= 0.40.0
-BuildRequires: libtool >= 2:2.2.6
+BuildRequires: meson >= 0.42.0
+BuildRequires: ninja >= 1.5
BuildRequires: pkgconfig >= 1:0.22
BuildRequires: rpmbuild(find_lang) >= 1.35
-BuildRequires: rpmbuild(macros) >= 1.592
+BuildRequires: rpmbuild(macros) >= 1.736
BuildRequires: tar >= 1:1.22
BuildRequires: xz
BuildRequires: yelp-tools
@@ -35,6 +29,11 @@ Provides: gnome-utils-dictionary =
%{epoch}:%{version}-%{release}
Obsoletes: gnome-dict
Obsoletes: gnome-utils-dict
Obsoletes: gnome-utils-dictionary < 1:3.3.2-1
+# system library dropped since 3.26; if something needs it, re-add as
libgdict.spec built from gnome-dictionary 3.24.1
+Obsoletes: libgdict < 1:3.26
+Obsoletes: libgdict-apidocs < 1:3.26
+Obsoletes: libgdict-devel < 1:3.26
+Obsoletes: libgdict-static < 1:3.26
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -45,87 +44,18 @@ spellings of words.
Pozwala na wyszukiwanie definicji i poprawnej pisowni słów w słowniku
sieciowym.
-%package -n libgdict
-Summary: libgdict library
-Summary(pl.UTF-8): Biblioteka libgdict
-License: LGPL v2+
-Group: X11/Libraries
-Requires: glib2 >= 1:2.42.0
-Requires: gtk+3 >= 3.22
-
-%description -n libgdict
-libgdict library.
-
-%description -n libgdict -l pl.UTF-8
-Biblioteka libgdict.
-
-%package -n libgdict-devel
-Summary: Header files for libgdict library
-Summary(pl.UTF-8): Pliki nagłówkowe biblioteki libgdict
-License: LGPL v2+
-Group: X11/Development/Libraries
-Requires: glib2-devel >= 1:2.42.0
-Requires: gtk+3-devel >= 3.22
-Requires: libgdict = %{epoch}:%{version}-%{release}
-
-%description -n libgdict-devel
-This is the package containing the header files for libgdict library.
-
-%description -n libgdict-devel -l pl.UTF-8
-Ten pakiet zawiera pliki nagłówkowe biblioteki libgdict.
-
-%package -n libgdict-static
-Summary: Static libgdict library
-Summary(pl.UTF-8): Statyczna biblioteka libgdict
-License: LGPL v2+
-Group: X11/Development/Libraries
-Requires: libgdict-devel = %{epoch}:%{version}-%{release}
-
-%description -n libgdict-static
-Static libgdict library.
-
-%description -n libgdict-static -l pl.UTF-8
-Statyczna biblioteka libgdict.
-
-%package -n libgdict-apidocs
-Summary: libgdict API documentation
-Summary(pl.UTF-8): Dokumentacja API libgdict
-Group: Documentation
-Requires: gtk-doc-common
-%if "%{_rpmversion}" >= "5"
-BuildArch: noarch
-%endif
-
-%description -n libgdict-apidocs
-libgdict API documentation.
-
-%description -n libgdict-apidocs -l pl.UTF-8
-Dokumentacja API libgdict.
-
%prep
%setup -q
%build
-%{__intltoolize}
-%{__libtoolize}
-%{__aclocal} -I m4
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
- --disable-silent-rules \
- --enable-gtk-doc \
- %{?with_static_libs:--enable-static} \
- --with-html-dir=%{_gtkdocdir}
-%{__make}
+%meson build
+
+%ninja_build -C build
%install
rm -rf $RPM_BUILD_ROOT
-%{__make} install \
- DESTDIR=$RPM_BUILD_ROOT
-
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libgdict-1.0.la
+%ninja_install -C build
%find_lang %{name} --with-gnome
@@ -138,39 +68,17 @@ rm -rf $RPM_BUILD_ROOT
%postun
%glib_compile_schemas
-%post -n libgdict -p /sbin/ldconfig
-%postun -n libgdict -p /sbin/ldconfig
-
%files -f %{name}.lang
%defattr(644,root,root,755)
-%doc AUTHORS NEWS README TODO
+%doc NEWS README.md
%attr(755,root,root) %{_bindir}/gnome-dictionary
%{_datadir}/appdata/org.gnome.Dictionary.appdata.xml
%{_datadir}/dbus-1/services/org.gnome.Dictionary.service
+%dir %{_datadir}/gdict-1.0
+%dir %{_datadir}/gdict-1.0/sources
+%{_datadir}/gdict-1.0/sources/default.desktop
+%{_datadir}/gdict-1.0/sources/spanish.desktop
+%{_datadir}/gdict-1.0/sources/thai.desktop
%{_datadir}/glib-2.0/schemas/org.gnome.dictionary.gschema.xml
%{_desktopdir}/org.gnome.Dictionary.desktop
%{_mandir}/man1/gnome-dictionary.1*
-
-%files -n libgdict
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libgdict-1.0.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgdict-1.0.so.10
-%{_libdir}/girepository-1.0/Gdict-1.0.typelib
-%{_datadir}/gdict-1.0
-
-%files -n libgdict-devel
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libgdict-1.0.so
-%{_includedir}/gdict-1.0
-%{_datadir}/gir-1.0/Gdict-1.0.gir
-%{_pkgconfigdir}/gdict-1.0.pc
-
-%if %{with static_libs}
-%files -n libgdict-static
-%defattr(644,root,root,755)
-%{_libdir}/libgdict-1.0.a
-%endif
-
-%files -n libgdict-apidocs
-%defattr(644,root,root,755)
-%{_gtkdocdir}/gdict
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gnome-dictionary.git/commitdiff/df25b7184606c935a7e0ec65471038c221425cfa
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
