[packages/libaccounts-glib] - updated to 1.24 - build system switched to meson, now python3 module is built (preserve python2 ma

qboosh qboosh at pld-linux.org
Mon Apr 22 12:48:19 CEST 2019 

commit 9de2d6061c2b4bb8682d450f3e4581b8117cae37
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Apr 22 12:48:33 2019 +0200

    - updated to 1.24
    - build system switched to meson, now python3 module is built (preserve python2 made by hand for now), prepare man pages by hand

 libaccounts-glib.spec | 132 ++++++++++++++++++++++++++++++++++----------------
 1 file changed, 89 insertions(+), 43 deletions(-)
---
diff --git a/libaccounts-glib.spec b/libaccounts-glib.spec
index 3b466fd..a158ada 100644
--- a/libaccounts-glib.spec
+++ b/libaccounts-glib.spec
@@ -1,33 +1,35 @@
 #
 # Conditional build:
+%bcond_without	python2		# Python 2.x binding (deprecated, not supported upstream)
 %bcond_without	static_libs	# static library
 %bcond_without	tests		# testsuite build [switch broken in configure]
 
 Summary:	Accounts management library for GLib applications
 Summary(pl.UTF-8):	Biblioteka do zarządzania kontami dla aplikacji opartych na bibliotece GLib
 Name:		libaccounts-glib
-Version:	1.23
+Version:	1.24
 Release:	1
 License:	LGPL v2.1
 Group:		Libraries
-#Source0Download: https://gitlab.com/accounts-sso/libaccounts-glib/tags?updated_desc
-Source0:	https://gitlab.com/accounts-sso/libaccounts-glib/repository/archive.tar.bz2?ref=VERSION_%{version}&fake_out=/%{name}-%{version}.tar.bz2
-# Source0-md5:	f71c0393fb7cd6397b145fe4ad0ebba9
+#Source0Download: https://gitlab.com/accounts-sso/libaccounts-glib/tags
+Source0:	https://gitlab.com/accounts-sso/libaccounts-glib/-/archive/%{version}/%{name}-%{version}.tar.bz2
+# Source0-md5:	bdd91a93ec089547d2d186e9840575c5
 URL:		https://gitlab.com/accounts-sso/libaccounts-glib
-BuildRequires:	autoconf >= 2.64
-BuildRequires:	automake >= 1:1.11
 %{?with_tests:BuildRequires:	check-devel >= 0.9.4}
 BuildRequires:	docbook-dtd43-xml
-BuildRequires:	docbook-style-xsl
+BuildRequires:	docbook-style-xsl-nons
 BuildRequires:	glib2-devel >= 1:2.36
 BuildRequires:	gobject-introspection-devel >= 1.30.0
 BuildRequires:	gtk-doc >= 1.14
-BuildRequires:	libtool >= 2:2.2
 BuildRequires:	libxml2-devel >= 2.0
 BuildRequires:	libxslt-progs
+BuildRequires:	meson
+BuildRequires:	ninja >= 1.5
 BuildRequires:	pkgconfig
-BuildRequires:	python-pygobject3-devel >= 3.0
-BuildRequires:	rpmbuild(macros) >= 1.219
+%{?with_python2:BuildRequires:	python-pygobject3-devel >= 3.0}
+BuildRequires:	python3-pygobject3-devel >= 3.0
+BuildRequires:	rpmbuild(macros) >= 1.736
+BuildRequires:	sed >= 4.0
 BuildRequires:	sqlite3-devel >= 3.7.0
 Requires:	glib2 >= 1:2.36
 Requires:	sqlite3 >= 3.7.0
@@ -84,17 +86,30 @@ API documentation for libaccounts-glib library.
 Dokumentacja API biblioteki libaccounts-glib.
 
 %package -n python-libaccounts-glib
-Summary:	Python bindings for libaccounts-glib
-Summary(pl.UTF-8):	Wiązania Pythona do biblioteki libaccounts-glib
+Summary:	Python 2 bindings for libaccounts-glib
+Summary(pl.UTF-8):	Wiązania Pythona 2 do biblioteki libaccounts-glib
 Group:		Development/Languages/Python
 Requires:	%{name} = %{version}-%{release}
 Requires:	python-pygobject3 >= 3
 
 %description -n python-libaccounts-glib
-Python bindings for libaccounts-glib.
+Python 2 bindings for libaccounts-glib.
 
 %description -n python-libaccounts-glib -l pl.UTF-8
-Wiązania Pythona do biblioteki libaccounts-glib.
+Wiązania Pythona 2 do biblioteki libaccounts-glib.
+
+%package -n python3-libaccounts-glib
+Summary:	Python 3 bindings for libaccounts-glib
+Summary(pl.UTF-8):	Wiązania Pythona 3 do biblioteki libaccounts-glib
+Group:		Development/Languages/Python
+Requires:	%{name} = %{version}-%{release}
+Requires:	python3-pygobject3 >= 3
+
+%description -n python3-libaccounts-glib
+Python 3 bindings for libaccounts-glib.
+
+%description -n python3-libaccounts-glib -l pl.UTF-8
+Wiązania Pythona 3 do biblioteki libaccounts-glib.
 
 %package -n vala-libaccounts-glib
 Summary:	Vala API for libaccounts-glib
@@ -112,38 +127,54 @@ Vala API for libaccounts-glib.
 %description -n vala-libaccounts-glib -l pl.UTF-8
 API języka Vala do biblioteki libaccounts-glib.
 
+%package -n gettext-its-accounts
+Summary:	Accounts ITS data for gettext tools
+Summary(pl.UTF-8):	Dane ITS Accounts dla narzędzi gettext
+Group:		Development/Tools
+Requires:	gettext-tools >= 0.19
+
+%description -n gettext-its-accounts
+Accounts ITS data for gettext tools.
+
+%description -n gettext-its-accounts -l pl.UTF-8
+Dane ITS Accounts dla narzędzi gettext.
+
 %prep
-%setup -q -n %{name}-VERSION_%{version}-8d14b10652b2fe6c25d8ad8334e2d5023d254313
+%setup -q
+
+%if %{with static_libs}
+%{__sed} -i -e '/^ag_library =/ s/shared_library/library/' libaccounts-glib/meson.build
+%endif
 
 %build
-%{__gtkdocize} --flavour no-tmpl
-%{__libtoolize}
-%{__aclocal} -I m4
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
-	--enable-gtk-doc \
-	--disable-silent-rules \
-	%{?with_static_libs:--enable-static} \
-	%{!?with_tests:--disable-tests} \
-	--with-html-dir=%{_gtkdocdir}
-%{__make}
+%meson build
+
+%ninja_build -C build
+
+# not built from meson
+xsltproc --nonet -o build/ --path docs/reference:build/docs/reference \
+	http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl docs/reference/ag-backup.xml
+xsltproc --nonet -o build/ --path docs/reference:build/docs/reference \
+	http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl docs/reference/ag-tool.xml
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
-
-# obsoleted by pkg-config
-%{__rm}	$RPM_BUILD_ROOT%{_libdir}/libaccounts-glib.la
-%if %{with tests}
-# tests suite
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libaccounts-glib/*test*
-%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/libaccounts-glib/testdata
-%endif
 
+%ninja_install -C build
+
+%py3_comp $RPM_BUILD_ROOT%{py3_sitedir}/gi/overrides
+%py3_ocomp $RPM_BUILD_ROOT%{py3_sitedir}/gi/overrides
+
+%if %{with python2}
+install -d $RPM_BUILD_ROOT%{py_sitedir}/gi/overrides
+cp -p libaccounts-glib/pygobject/Accounts.py $RPM_BUILD_ROOT%{py_sitedir}/gi/overrides
+%py_comp $RPM_BUILD_ROOT%{py_sitedir}/gi/overrides
+%py_ocomp $RPM_BUILD_ROOT%{py_sitedir}/gi/overrides
 %py_postclean
+%endif
+
+install -d $RPM_BUILD_ROOT%{_mandir}/man1
+cp -p build/{ag-backup.1,ag-tool.1} $RPM_BUILD_ROOT%{_mandir}/man1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -153,14 +184,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README
+%doc NEWS README.md
 %attr(755,root,root) %{_bindir}/ag-backup
 %attr(755,root,root) %{_bindir}/ag-tool
-%attr(755,root,root) %{_libdir}/libaccounts-glib.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libaccounts-glib.so.0
+%attr(755,root,root) %{_libdir}/libaccounts-glib.so.1
 %{_libdir}/girepository-1.0/Accounts-1.0.typelib
-# who owns / uses it?
-#%{_datadir}/backup-framework/applications/accounts.conf
 # devel only or runtime too?
 %{_datadir}/dbus-1/interfaces/com.google.code.AccountsSSO.Accounts.Manager.xml
 %dir %{_datadir}/xml/accounts
@@ -187,11 +215,29 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{_gtkdocdir}/libaccounts-glib
 
+%if %{with python2}
 %files -n python-libaccounts-glib
 %defattr(644,root,root,755)
 %{py_sitedir}/gi/overrides/Accounts.py[co]
+%endif
+
+%files -n python3-libaccounts-glib
+%defattr(644,root,root,755)
+%{py3_sitedir}/gi/overrides/Accounts.py
+%{py3_sitedir}/gi/overrides/__pycache__/Accounts.cpython-*.py[co]
 
 %files -n vala-libaccounts-glib
 %defattr(644,root,root,755)
 %{_datadir}/vala/vapi/libaccounts-glib.deps
 %{_datadir}/vala/vapi/libaccounts-glib.vapi
+
+%files -n gettext-its-accounts
+%defattr(644,root,root,755)
+%{_datadir}/gettext/its/accounts-application.its
+%{_datadir}/gettext/its/accounts-application.loc
+%{_datadir}/gettext/its/accounts-provider.its
+%{_datadir}/gettext/its/accounts-provider.loc
+%{_datadir}/gettext/its/accounts-service-type.its
+%{_datadir}/gettext/its/accounts-service-type.loc
+%{_datadir}/gettext/its/accounts-service.its
+%{_datadir}/gettext/its/accounts-service.loc
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libaccounts-glib.git/commitdiff/9de2d6061c2b4bb8682d450f3e4581b8117cae37

More information about the pld-cvs-commit mailing list