[packages/grilo] Updated to 0.3.7

[jareq]

commit e66622ca535ede47486c3a892ac7ead16a87f041
Author: Jaroslaw Kruk <kruk.jaroslaw at gmail.com>
Date:   Sun Jan 20 19:16:56 2019 +0100

    Updated to 0.3.7

 grilo-sh.patch | 11 -----------
 grilo.spec     | 55 +++++++++----------------------------------------------
 2 files changed, 9 insertions(+), 57 deletions(-)
---
diff --git a/grilo.spec b/grilo.spec
index 60ed770..af36e5d 100644
--- a/grilo.spec
+++ b/grilo.spec
@@ -1,22 +1,18 @@
 #
 # Conditional build:
 %bcond_without	apidocs		# do not build and package API docs
-%bcond_without	static_libs	# don't build static libraries
 %bcond_without	vala		# do not build Vala API
 
 Summary:	Framework for access to sources of multimedia content
 Summary(pl.UTF-8):	Szkielet dostępu do źródeł treści multimedialnych
 Name:		grilo
-Version:	0.3.4
+Version:	0.3.7
 Release:	1
 License:	LGPL v2.1+
 Group:		Libraries
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/grilo/0.3/%{name}-%{version}.tar.xz
-# Source0-md5:	a15a92a903aeb7579e1b0f6e8b4b0fb1
-Patch0:		%{name}-sh.patch
+# Source0-md5:	7c2c9a506e64e5f1a5fafd89ce53d9b0
 URL:		http://live.gnome.org/Grilo
-BuildRequires:	autoconf >= 2.50
-BuildRequires:	automake
 BuildRequires:	glib2-devel >= 1:2.44.0
 BuildRequires:	gnome-common
 BuildRequires:	gobject-introspection-devel >= 0.9
@@ -27,6 +23,8 @@ BuildRequires:	liboauth-devel
 BuildRequires:	libsoup-devel >= 2.42.0
 BuildRequires:	libtool >= 2:2.2.6
 BuildRequires:	libxml2-devel >= 2
+BuildRequires:	meson
+BuildRequires:	ninja
 BuildRequires:	pkgconfig
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	totem-pl-parser-devel >= 3.4.1
@@ -59,18 +57,6 @@ Header files for grilo libraries.
 %description devel -l pl.UTF-8
 Pliki nagłówkowe bibliotek grilo.
 
-%package static
-Summary:	Static grilo libraries
-Summary(pl.UTF-8):	Statyczne biblioteki grilo
-Group:		Development/Libraries
-Requires:	%{name}-devel = %{version}-%{release}
-
-%description static
-Static grilo libraries.
-
-%description static -l pl.UTF-8
-Statyczne biblioteki grilo.
-
 %package apidocs
 Summary:	grilo API documentation
 Summary(pl.UTF-8):	Dokumentacja API bibliotek grilo
@@ -104,30 +90,16 @@ API języka Vala do bibliotek grilo.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
-%{__libtoolize}
-%{__aclocal} -I m4
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
-	--disable-debug \
-	%{__enable_disable apidocs gtk-doc} \
-	--disable-silent-rules \
-	%{__enable_disable static_libs static} \
-	--with-html-dir=%{_gtkdocdir}
-%{__make}
+%meson %{?with_apidocs:-Denable-gtk-doc=true} \
+	%{?without_vala:-Denable-vala=false} build
+%ninja_build -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_libdir}/grilo-0.3
 
-%{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
-
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/lib*.la
+%ninja_install -C build
 
 %find_lang %{name}
 
@@ -139,7 +111,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README TODO
+%doc AUTHORS NEWS README.md TODO
 %attr(755,root,root) %{_bindir}/grilo-test-ui-0.3
 %attr(755,root,root) %{_bindir}/grl-inspect-0.3
 %attr(755,root,root) %{_bindir}/grl-launch-0.3
@@ -149,7 +121,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %ghost %{_libdir}/libgrlnet-0.3.so.0
 %attr(755,root,root) %{_libdir}/libgrlpls-0.3.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libgrlpls-0.3.so.0
-%dir %{_libdir}/grilo-0.3
 %{_libdir}/girepository-1.0/Grl-0.3.typelib
 %{_libdir}/girepository-1.0/GrlNet-0.3.typelib
 %{_libdir}/girepository-1.0/GrlPls-0.3.typelib
@@ -170,14 +141,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gir-1.0/GrlNet-0.3.gir
 %{_datadir}/gir-1.0/GrlPls-0.3.gir
 
-%if %{with static_libs}
-%files static
-%defattr(644,root,root,755)
-%{_libdir}/libgrilo-0.3.a
-%{_libdir}/libgrlnet-0.3.a
-%{_libdir}/libgrlpls-0.3.a
-%endif
-
 %if %{with apidocs}
 %files apidocs
 %defattr(644,root,root,755)
diff --git a/grilo-sh.patch b/grilo-sh.patch
deleted file mode 100644
index 27158a8..0000000
--- a/grilo-sh.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- grilo-0.2.3/configure.ac.orig	2012-11-08 14:27:44.000000000 +0100
-+++ grilo-0.2.3/configure.ac	2012-11-29 18:53:59.234567402 +0100
-@@ -61,7 +61,7 @@
- # ----------------------------------------------------------
- 
- GNOME_COMPILE_WARNINGS([maximum])
--CFLAGS+=" ${WARN_CFLAGS} -Wmissing-declarations -std=c99 "
-+CFLAGS="$CFLAGS ${WARN_CFLAGS} -Wmissing-declarations -std=c99 "
- 
- GNOME_MAINTAINER_MODE_DEFINES
- 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/grilo.git/commitdiff/e66622ca535ede47486c3a892ac7ead16a87f041