[packages/libfprint] - new URLs, updated to 0.8.2 - added gtkdoc patch (fixes meson/gtk-doc incompatibility)

qboosh qboosh at pld-linux.org
Sun Dec 16 16:40:23 CET 2018


commit 000ef164bfb8cfff257b0d3cdd646b40b4e33a38
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Dec 16 16:44:58 2018 +0100

    - new URLs, updated to 0.8.2
    - added gtkdoc patch (fixes meson/gtk-doc incompatibility)

 libfprint-gtkdoc.patch | 10 ++++++++++
 libfprint.spec         | 46 ++++++++++++++++++++++++++++++++++------------
 2 files changed, 44 insertions(+), 12 deletions(-)
---
diff --git a/libfprint.spec b/libfprint.spec
index 37ffcf6..ca7fa9a 100644
--- a/libfprint.spec
+++ b/libfprint.spec
@@ -5,15 +5,20 @@
 Summary:	Fingerprint reader library
 Summary(pl.UTF-8):	Biblioteka do obsługi czytników linii papilarnych
 Name:		libfprint
-Version:	0.6.0
+Version:	0.8.2
 Release:	1
 License:	LGPL v2.1+
 Group:		Libraries
-Source0:	http://people.freedesktop.org/~hadess/%{name}-%{version}.tar.xz
-# Source0-md5:	1e66f6e786348b46075368cc682450a8
-URL:		http://reactivated.net/fprint/wiki/Libfprint
+#Source0Download: https://gitlab.freedesktop.org/libfprint/libfprint/tags
+Source0:	https://gitlab.freedesktop.org/libfprint/libfprint/uploads/4272fab4f37516db5b20d07bb576a4b1/%{name}-%{version}.tar.xz
+# Source0-md5:	7cc2ffd39b6f86d127c0581597f855e8
+Patch0:		%{name}-gtkdoc.patch
+URL:		https://fprint.freedesktop.org/
 BuildRequires:	glib2-devel >= 1:2.28
+BuildRequires:	gtk-doc
 BuildRequires:	libusb-devel >= 0.9.1
+BuildRequires:	meson >= 0.47.0
+BuildRequires:	ninja
 BuildRequires:	nss-devel
 BuildRequires:	pixman-devel
 BuildRequires:	pkgconfig
@@ -61,6 +66,20 @@ Static fprint library.
 %description static -l pl.UTF-8
 Statyczna biblioteka fprint.
 
+%package apidocs
+Summary:	API documentation for libfprint library
+Summary(pl.UTF-8):	Dokumentacja API biblioteki libfprint
+Group:		Documentation
+%if "%{_rpmversion}" >= "5"
+BuildArch:	noarch
+%endif
+
+%description apidocs
+API documentation for libfprint library.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API biblioteki libfprint.
+
 %package -n udev-libfprint
 Summary:	Udev rules for libfprint
 Summary(pl.UTF-8):	Reguły udeva dla libfprint
@@ -76,20 +95,20 @@ Reguły udeva dla libfprint.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
-%configure \
-	--disable-silent-rules \
-	%{?with_static_libs:--enable-static}
+%meson build \
+	-Dx11-examples=false \
+	%{!?with_static_libs:--default=library=shared}
 
-%{__make}
+%meson_build -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
-%{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
+%meson_install -C build
 
 install examples/*.c $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
@@ -101,14 +120,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog HACKING NEWS README THANKS TODO
+%doc AUTHORS HACKING.md NEWS README THANKS TODO
 %attr(755,root,root) %{_libdir}/libfprint.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libfprint.so.0
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libfprint.so
-%{_libdir}/libfprint.la
 %dir %{_includedir}/libfprint
 %{_includedir}/libfprint/fprint.h
 %{_pkgconfigdir}/libfprint.pc
@@ -120,6 +138,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libfprint.a
 %endif
 
+%files apidocs
+%defattr(644,root,root,755)
+%{_gtkdocdir}/libfprint
+
 %files -n udev-libfprint
 %defattr(644,root,root,755)
 /lib/udev/rules.d/60-fprint-autosuspend.rules
diff --git a/libfprint-gtkdoc.patch b/libfprint-gtkdoc.patch
new file mode 100644
index 0000000..96508c1
--- /dev/null
+++ b/libfprint-gtkdoc.patch
@@ -0,0 +1,10 @@
+--- libfprint-0.8.2/doc/meson.build.orig	2018-07-17 13:49:47.000000000 +0200
++++ libfprint-0.8.2/doc/meson.build	2018-12-16 15:40:04.836362925 +0100
+@@ -54,7 +54,6 @@
+              content_files: content_files,
+              expand_content_files: expand_content_files,
+              scan_args: [
+-               '--rebuild-types',
+                '--ignore-decorators=API_EXPORTED',
+                '--ignore-headers=' + ' '.join(private_headers),
+              ],
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libfprint.git/commitdiff/000ef164bfb8cfff257b0d3cdd646b40b4e33a38



More information about the pld-cvs-commit mailing list