[packages/gnome-autoar] - updated to 0.4.0, uses meson now - updated pc patch - split vala- packages into base and -gtk

qboosh qboosh at pld-linux.org
Wed Aug 18 22:02:44 CEST 2021 

commit 54c2da3ca7c26055f03df99dc0a3d06d518e5a33
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Aug 18 22:07:03 2021 +0200

    - updated to 0.4.0, uses meson now
    - updated pc patch
    - split vala- packages into base and -gtk

 gnome-autoar-pc.patch |  21 +++++-----
 gnome-autoar.spec     | 106 ++++++++++++++++++++++++++++----------------------
 2 files changed, 70 insertions(+), 57 deletions(-)
---
diff --git a/gnome-autoar.spec b/gnome-autoar.spec
index 2774390..377a3fb 100644
--- a/gnome-autoar.spec
+++ b/gnome-autoar.spec
@@ -1,35 +1,36 @@
 #
 # Conditional build:
+%bcond_without	apidocs		# API documentation
 %bcond_without	static_libs	# static libraries
 
 Summary:	Automatic archives creating and extracting library
 Summary(pl.UTF-8):	Biblioteka do automatycznego tworzenia i rozpakowywania archiwów
 Name:		gnome-autoar
-Version:	0.3.3
+Version:	0.4.0
 Release:	1
 License:	LGPL v2.1+
 Group:		Libraries
-Source0:	https://download.gnome.org/sources/gnome-autoar/0.3/%{name}-%{version}.tar.xz
-# Source0-md5:	5c3af53d0ceb077e1588788f491b0b78
+Source0:	https://download.gnome.org/sources/gnome-autoar/0.4/%{name}-%{version}.tar.xz
+# Source0-md5:	bef689989c88e3f0712dd4cf1edeac8c
 Patch0:		%{name}-pc.patch
 URL:		https://github.com/GNOME/gnome-autoar/
-BuildRequires:	autoconf >= 2.68
-BuildRequires:	automake >= 1:1.11
 BuildRequires:	glib2-devel >= 1:2.36
 BuildRequires:	gobject-introspection-devel >= 1.30.0
 BuildRequires:	gtk+3-devel >= 3.2
-BuildRequires:	gtk-doc >= 1.14
-BuildRequires:	libarchive-devel >= 3.2.0
-BuildRequires:	libtool >= 2:2
+%{?with_apidocs:BuildRequires:	gtk-doc >= 1.14}
+BuildRequires:	libarchive-devel >= 3.4.0
+BuildRequires:	meson >= 0.58.0
 BuildRequires:	pkgconfig
+BuildRequires:	ninja >= 1.5
 BuildRequires:	rpm-build >= 4.6
 BuildRequires:	rpmbuild(macros) >= 1.752
+BuildRequires:	sed >= 4.0
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	vala >= 2:0.22.0
 BuildRequires:	xz
 Requires(post,postun):	/sbin/ldconfig
 Requires:	glib2 >= 1:2.36
-Requires:	libarchive >= 3.2.0
+Requires:	libarchive >= 3.4.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -48,7 +49,7 @@ Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki gnome-autoar
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	glib2-devel >= 1:2.36
-Requires:	libarchive-devel >= 3.2.0
+Requires:	libarchive-devel >= 3.4.0
 
 %description devel
 Header files for gnome-autoar library.
@@ -68,6 +69,20 @@ Static gnome-autoar library.
 %description static -l pl.UTF-8
 Statyczna biblioteka gnome-autoar.
 
+%package -n vala-gnome-autoar
+Summary:	gnome-autoar API for Vala language
+Summary(pl.UTF-8):	API gnome-autoar dla języka Vala
+Group:		Development/Libraries
+Requires:	%{name}-devel = %{version}-%{release}
+Requires:	vala >= 2:0.22.0
+BuildArch:	noarch
+
+%description -n vala-gnome-autoar
+gnome-autoar API for Vala language.
+
+%description -n vala-gnome-autoar -l pl.UTF-8
+API gnome-autoar dla języka Vala.
+
 %package gtk
 Summary:	GTK+ widgets library for gnome-autoar
 Summary(pl.UTF-8):	Biblioteka widgetów GTK+ dla biblioteki gnome-autoar
@@ -107,6 +122,20 @@ Static gnome-autoar-gtk library.
 %description gtk-static -l pl.UTF-8
 Statyczna biblioteka gnome-autoar-gtk.
 
+%package -n vala-gnome-autoar-gtk
+Summary:	gnome-autoar-gtk API for Vala language
+Summary(pl.UTF-8):	API gnome-autoar-gtk dla języka Vala
+Group:		Development/Libraries
+Requires:	%{name}-gtk-devel = %{version}-%{release}
+Requires:	vala-gnome-autoar = %{version}-%{release}
+BuildArch:	noarch
+
+%description -n vala-gnome-autoar-gtk
+gnome-autoar-gtk API for Vala language.
+
+%description -n vala-gnome-autoar-gtk -l pl.UTF-8
+API gnome-autoar-gtk dla języka Vala.
+
 %package apidocs
 Summary:	gnome-autoar API documentation
 Summary(pl.UTF-8):	Dokumentacja API bibliotek gnome-autoar
@@ -119,47 +148,25 @@ API documentation for gnome-autoar libraries.
 %description apidocs -l pl.UTF-8
 Dokumentacja API bibliotek gnome-autoar.
 
-%package -n vala-gnome-autoar
-Summary:	gnome-autoar API for Vala language
-Summary(pl.UTF-8):	API gnome-autoar dla języka Vala
-Group:		Development/Libraries
-Requires:	%{name}-devel = %{version}-%{release}
-Requires:	%{name}-gtk-devel = %{version}-%{release}
-Requires:	vala >= 2:0.22.0
-BuildArch:	noarch
-
-%description -n vala-gnome-autoar
-gnome-autoar API for Vala language.
-
-%description -n vala-gnome-autoar -l pl.UTF-8
-API gnome-autoar dla języka Vala.
-
 %prep
 %setup -q
 %patch0 -p1
 
+%if %{with static_libs}
+%{__sed} -i -e '/^libgnome_autoar\(_gtk\)\? =/ s/shared_library/library/' gnome-autoar/meson.build
+%endif
+
 %build
-%{__libtoolize}
-%{__gtkdocize}
-%{__aclocal} -I m4
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
-	--enable-gtk-doc \
-	--disable-silent-rules \
-	%{!?with_static_libs:--disable-static} \
-	--with-html-dir=%{_gtkdocdir}
-%{__make}
+%meson build \
+	%{?with_apidocs:-Dgtk_doc=true} \
+	-Dvapi=true
+
+%ninja_build -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
-
-# obsoleted by pkg-config
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libgnome-autoar*.la
+%ninja_install -C build
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -197,6 +204,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libgnome-autoar-0.a
 %endif
 
+%files -n vala-gnome-autoar
+%defattr(644,root,root,755)
+%{_datadir}/vala/vapi/gnome-autoar-0.deps
+%{_datadir}/vala/vapi/gnome-autoar-0.vapi
+
 %files gtk
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libgnome-autoar-gtk-0.so.*.*.*
@@ -217,11 +229,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libgnome-autoar-gtk-0.a
 %endif
 
-%files apidocs
+%files -n vala-gnome-autoar-gtk
 %defattr(644,root,root,755)
-%{_gtkdocdir}/gnome-autoar
+%{_datadir}/vala/vapi/gnome-autoar-gtk-0.deps
+%{_datadir}/vala/vapi/gnome-autoar-gtk-0.vapi
 
-%files -n vala-gnome-autoar
+%files apidocs
 %defattr(644,root,root,755)
-%{_datadir}/vala/vapi/gnome-autoar-0.vapi
-%{_datadir}/vala/vapi/gnome-autoar-gtk-0.vapi
+%{_gtkdocdir}/gnome-autoar
diff --git a/gnome-autoar-pc.patch b/gnome-autoar-pc.patch
index 45e0787..a856492 100644
--- a/gnome-autoar-pc.patch
+++ b/gnome-autoar-pc.patch
@@ -1,10 +1,11 @@
---- gnome-autoar-0300e4b31253779541a6f078ca45bd7a3bd6e7db/gnome-autoar/gnome-autoar-gtk.pc.in.orig	2014-10-14 10:46:45.000000000 +0200
-+++ gnome-autoar-0300e4b31253779541a6f078ca45bd7a3bd6e7db/gnome-autoar/gnome-autoar-gtk.pc.in	2015-10-04 08:56:32.631118145 +0200
-@@ -6,6 +6,6 @@
- Name: gnome-autoar
- Description: GTK+ widgets for gnome-autoar library
- Version: @VERSION@
--Requires: gtk+-3.0
-+Requires: gtk+-3.0 gnome-autoar-0
- Libs: -L${libdir} -lgnome-autoar-gtk- at LIBGNOME_AUTOAR_API_VERSION@
- Cflags: -I${includedir}/gnome-autoar- at LIBGNOME_AUTOAR_API_VERSION@
+--- gnome-autoar-0.4.0/gnome-autoar/meson.build.orig	2021-08-18 21:21:11.379734786 +0200
++++ gnome-autoar-0.4.0/gnome-autoar/meson.build	2021-08-18 21:28:23.287394942 +0200
+@@ -141,7 +141,7 @@ pkg.generate(
+   description: 'GTK+ widgets for gnome-autoar library',
+   filebase: libname_gtk,
+   subdirs: libname,
+-  requires: deps,
++  requires: deps + [libgnome_autoar],
+   variables: 'exec_prefix=${prefix}',
+ )
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gnome-autoar.git/commitdiff/54c2da3ca7c26055f03df99dc0a3d06d518e5a33

More information about the pld-cvs-commit mailing list