[packages/libgdata] - updated to 0.17.10; now uses meson - added soname patch (fixes library version/soversion setting a

qboosh qboosh at pld-linux.org
Wed Jun 26 18:56:36 CEST 2019


commit 0ff974eae69452ec08066042aff9234ddcb3e9ea
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Jun 26 18:57:55 2019 +0200

    - updated to 0.17.10; now uses meson
    - added soname patch (fixes library version/soversion setting after switch to meson)

 libgdata-soname.patch | 31 +++++++++++++++++++++++++++++++
 libgdata.spec         | 43 +++++++++++++++++--------------------------
 2 files changed, 48 insertions(+), 26 deletions(-)
---
diff --git a/libgdata.spec b/libgdata.spec
index 9e42e9e..a604682 100644
--- a/libgdata.spec
+++ b/libgdata.spec
@@ -1,32 +1,31 @@
 Summary:	GData access library
 Summary(pl.UTF-8):	Biblioteka dostępu poprzez protokół GData
 Name:		libgdata
-Version:	0.17.9
+Version:	0.17.10
 Release:	1
 License:	LGPL v2.1+
 Group:		Libraries
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/libgdata/0.17/%{name}-%{version}.tar.xz
-# Source0-md5:	cd41fec52a0f0ba999eb60025e0ac806
-URL:		https://wiki.gnome.org/action/show/Projects/libgdata
-BuildRequires:	autoconf >= 2.65
-BuildRequires:	automake >= 1:1.9
+# Source0-md5:	d858d411ad394c275643b14993dfeed4
+Patch0:		%{name}-soname.patch
+URL:		https://wiki.gnome.org/Projects/libgdata
 BuildRequires:	gcr-devel >= 3
 # for tests only
 BuildRequires:	gdk-pixbuf2-devel >= 2.14
 BuildRequires:	gettext-tools >= 0.17
 BuildRequires:	glib2-devel >= 1:2.44.0
-BuildRequires:	gnome-common >= 3.6.0
 BuildRequires:	gnome-online-accounts-devel >= 3.8
 BuildRequires:	gobject-introspection-devel >= 0.9.7
 BuildRequires:	gtk+3-devel >= 3.0
 BuildRequires:	gtk-doc >= 1.25
-BuildRequires:	intltool >= 0.40.0
 BuildRequires:	json-glib-devel >= 0.15
 BuildRequires:	liboauth-devel >= 0.9.4
 BuildRequires:	libsoup-devel >= 2.56.0
-BuildRequires:	libtool >= 2:2
 BuildRequires:	libxml2-devel >= 1:2.6.26
+BuildRequires:	meson >= 0.50.0
+BuildRequires:	ninja >= 1.5
 BuildRequires:	pkgconfig
+BuildRequires:	rpmbuild(macros) >= 1.736
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	uhttpmock-devel >= 0.5.0
 BuildRequires:	vala
@@ -117,29 +116,21 @@ API libgdata dla języka Vala.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
-%{__gtkdocize}
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
-	--enable-gtk-doc \
-	--with-html-dir=%{_gtkdocdir} \
-	--disable-silent-rules
-%{__make}
+%meson build \
+	-Dinstalled_tests=false \
+	-Dman=true
+
+%ninja_build -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
-
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libgdata.la
+%ninja_install -C build
 
-%find_lang gdata
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -147,9 +138,9 @@ rm -rf $RPM_BUILD_ROOT
 %post   -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
-%files -f gdata.lang
+%files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README
+%doc AUTHORS NEWS README
 %attr(755,root,root) %{_libdir}/libgdata.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libgdata.so.22
 %{_libdir}/girepository-1.0/GData-0.0.typelib
diff --git a/libgdata-soname.patch b/libgdata-soname.patch
new file mode 100644
index 0000000..68d0716
--- /dev/null
+++ b/libgdata-soname.patch
@@ -0,0 +1,31 @@
+--- libgdata-0.17.10/meson.build.orig	2019-06-25 14:09:09.000000000 +0200
++++ libgdata-0.17.10/meson.build	2019-06-26 18:51:01.522940933 +0200
+@@ -37,7 +37,8 @@
+ current = 26
+ revision = 0
+ age = 4
+-gdata_soversion = '@0 at .@1 at .@2@'.format(current - age, age, revision)
++gdata_libversion = '@0 at .@1 at .@2@'.format(current - age, age, revision)
++gdata_soversion = '@0@'.format(current - age)
+ 
+ top_inc_dir = include_directories('.')
+ 
+--- libgdata-0.17.10/gdata/meson.build.orig	2019-06-25 14:09:09.000000000 +0200
++++ libgdata-0.17.10/gdata/meson.build	2019-06-26 18:51:00.606279233 +0200
+@@ -134,7 +134,7 @@
+ symbol_map = meson.current_source_dir() / 'symbol.map'
+ ldflags = cc.get_supported_link_arguments('-Wl,--version-script,' + symbol_map)
+ 
+-libgdata_lib = shared_library(
++libgdata_lib = library(
+   'gdata',
+   include_directories: incs,
+   sources: sources + enum_headers + marshal_files,
+@@ -142,6 +142,7 @@
+   link_args: ldflags,
+   link_depends: symbol_map,
+   install: true,
++  version: gdata_libversion,
+   soversion: gdata_soversion,
+   gnu_symbol_visibility: 'default',
+ )
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libgdata.git/commitdiff/0ff974eae69452ec08066042aff9234ddcb3e9ea



More information about the pld-cvs-commit mailing list