[packages/libchamplain] - updated to 0.12.20; now uses meson - added gtkdocdir patch

Wed Oct 30 18:57:20 CET 2019

commit 6bd3d14f4264ab5bba9a4064844a562215861d28
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Oct 30 18:57:12 2019 +0100

    - updated to 0.12.20; now uses meson
    - added gtkdocdir patch

 libchamplain-gtkdocdir.patch | 24 +++++++++++++++
 libchamplain.spec            | 72 +++++++++++++++++++++++++-------------------
 2 files changed, 65 insertions(+), 31 deletions(-)
---

diff --git a/libchamplain.spec b/libchamplain.spec
index c7705a1..c583fbd 100644
--- a/libchamplain.spec
+++ b/libchamplain.spec
@@ -7,31 +7,33 @@
 Summary:	Map widget for Clutter
 Summary(pl.UTF-8):	Widget mapy dla Cluttera
 Name:		libchamplain
-Version:	0.12.19
+Version:	0.12.20
 Release:	1
-License:	LGPL v2
+License:	LGPL v2.1+
 Group:		X11/Libraries
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/libchamplain/0.12/%{name}-%{version}.tar.xz
-# Source0-md5:	a3015b1f32d80d65515f8042ce595b30
+# Source0-md5:	e58b364ffc2ea6bba9e58f95ee2a5229
+Patch0:		%{name}-gtkdocdir.patch
 URL:		https://wiki.gnome.org/Projects/libchamplain
-BuildRequires:	autoconf >= 2.64
-BuildRequires:	automake
 BuildRequires:	cairo-devel >= 1.4.0
 BuildRequires:	clutter-devel >= 1.24
 BuildRequires:	clutter-gtk-devel >= 1.0
 BuildRequires:	docbook-dtd412-xml
 BuildRequires:	glib2-devel >= 1:2.38
 BuildRequires:	glibc-misc
-BuildRequires:	gnome-common
 BuildRequires:	gobject-introspection-devel >= 0.6.3
 BuildRequires:	gtk+3-devel >= 3.0.0
 BuildRequires:	gtk-doc >= 1.15
 BuildRequires:	libsoup-devel >= 2.42
-BuildRequires:	libtool >= 2:2.2.6
 %{?with_memphis:BuildRequires:	memphis-devel >= 0.2.1}
+BuildRequires:	meson >= 0.49.0
+BuildRequires:	ninja >= 1.5
 BuildRequires:	pkgconfig
+BuildRequires:	rpmbuild(macros) >= 1.736
 BuildRequires:	sqlite3-devel >= 3.0
-%{?with_vala:BuildRequires:	vala >= 0.11.0}
+BuildRequires:	tar >= 1:1.22
+%{?with_vala:BuildRequires:	vala >= 0.15.1}
+BuildRequires:	xz
 Requires:	cairo >= 1.4.0
 Requires:	clutter >= 1.24
 Requires:	clutter-gtk >= 1.0
@@ -67,6 +69,18 @@ Header files for the libchamplain library.
 %description devel -l pl.UTF-8
 Pliki nagłówkowe biblioteki libchamplain.
 
+%package static
+Summary:	Static libchamplain libraries
+Summary(pl.UTF-8):	Statyczne biblioteki libchamplain
+Group:		X11/Development/Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description static
+Static libchamplain libraries.
+
+%description static -l pl.UTF-8
+Statyczne biblioteki libchamplain.
+
 %package apidocs
 Summary:	libchamplain API documentation
 Summary(pl.UTF-8):	Dokumentacja API biblioteki libchamplain
@@ -87,7 +101,7 @@ Summary:	libchamplain API for Vala language
 Summary(pl.UTF-8):	API libchamplain dla języka Vala
 Group:		Development/Libraries
 Requires:	%{name}-devel = %{version}-%{release}
-Requires:	vala >= 0.11.0
+Requires:	vala >= 0.15.1
 %if "%{_rpmversion}" >= "5"
 BuildArch:	noarch
 %endif
@@ -100,31 +114,19 @@ API libchamplain dla języka Vala.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
-%{__gtkdocize}
-%{__libtoolize}
-%{__aclocal} -I m4
-%{__autoheader}
-%{__autoconf}
-%{__automake}
-%configure \
-	--disable-silent-rules \
-	--disable-static \
-	--enable-gtk \
-	%{__enable_disable apidocs gtk-doc} \
-	%{?with_memphis:--enable-memphis} \
-	%{__enable_disable vala vala} \
-	--with-html-dir=%{_gtkdocdir}
-%{__make}
+%meson build \
+	%{?with_apidocs:-Dgtk_doc=true} \
+	%{?with_memphis:-Dmemphis=true}
+
+%ninja_build -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
-
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
+%ninja_install -C build
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -134,7 +136,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README
+%doc AUTHORS NEWS README.md
 %attr(755,root,root) %{_libdir}/libchamplain-0.12.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libchamplain-0.12.so.0
 %attr(755,root,root) %{_libdir}/libchamplain-gtk-0.12.so.*.*.*
@@ -146,13 +148,19 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libchamplain-0.12.so
 %attr(755,root,root) %{_libdir}/libchamplain-gtk-0.12.so
-%{_includedir}/libchamplain-0.12
-%{_includedir}/libchamplain-gtk-0.12
+%dir %{_includedir}/champlain-0.12
+%{_includedir}/champlain-0.12/champlain
+%{_includedir}/champlain-0.12/champlain-gtk
 %{_pkgconfigdir}/champlain-0.12.pc
 %{_pkgconfigdir}/champlain-gtk-0.12.pc
 %{_datadir}/gir-1.0/Champlain-0.12.gir
 %{_datadir}/gir-1.0/GtkChamplain-0.12.gir
 
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/libchamplain-0.12.a
+%{_libdir}/libchamplain-gtk-0.12.a
+
 %if %{with apidocs}
 %files apidocs
 %defattr(644,root,root,755)
@@ -162,6 +170,8 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with vala}
 %files -n vala-libchamplain
 %defattr(644,root,root,755)
+%{_datadir}/vala/vapi/champlain-0.12.deps
 %{_datadir}/vala/vapi/champlain-0.12.vapi
+%{_datadir}/vala/vapi/champlain-gtk-0.12.deps
 %{_datadir}/vala/vapi/champlain-gtk-0.12.vapi
 %endif
diff --git a/libchamplain-gtkdocdir.patch b/libchamplain-gtkdocdir.patch
new file mode 100644
index 0000000..48b152d
--- /dev/null
+++ b/libchamplain-gtkdocdir.patch
@@ -0,0 +1,24 @@
+--- libchamplain-0.12.20/docs/reference/meson.build.orig	2019-10-28 22:57:28.000000000 +0100
++++ libchamplain-0.12.20/docs/reference/meson.build	2019-10-30 18:35:52.103539121 +0100
+@@ -1,16 +1,16 @@
+ glib_prefix = glib_dep.get_pkgconfig_variable('prefix')
+-glib_docpath = join_paths(glib_prefix, 'share', 'gtk-doc', 'html', 'glib')
++glib_docpath = join_paths(glib_prefix, 'share', 'doc', 'gtk-doc', 'html', 'glib')
+ 
+ gobject_prefix = gobject_dep.get_pkgconfig_variable('prefix')
+-gobject_docpath = join_paths(gobject_prefix, 'share', 'gtk-doc', 'html', 'gobject')
++gobject_docpath = join_paths(gobject_prefix, 'share', 'doc', 'gtk-doc', 'html', 'gobject')
+ 
+ clutter_prefix = clutter_dep.get_pkgconfig_variable('prefix')
+-clutter_docpath = join_paths(clutter_prefix, 'share', 'gtk-doc', 'html', 'clutter')
++clutter_docpath = join_paths(clutter_prefix, 'share', 'doc', 'gtk-doc', 'html', 'clutter')
+ 
+ gtk_prefix = gtk_dep.get_pkgconfig_variable('prefix')
+-gtk_docpath = join_paths(gtk_prefix, 'share', 'gtk-doc', 'html', 'gtk3')
++gtk_docpath = join_paths(gtk_prefix, 'share', 'doc', 'gtk-doc', 'html', 'gtk3')
+ 
+-gtkdocdir = join_paths(datadir, 'gtk-doc', 'html', package_string)
++gtkdocdir = join_paths(datadir, 'doc', 'gtk-doc', 'html', package_string)
+ 
+ libchamplain_reference_ignored_h = [
+   'champlain-gtk.h',
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libchamplain.git/commitdiff/6bd3d14f4264ab5bba9a4064844a562215861d28

