[packages/libdsm] - updated to 0.4.0, uses meson now - added meson patch (fixes doxygen target, adds executables insta

[qboosh]

commit 79dbeaba6652817ae304cf0c77cee117dbf3dfa2
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Fri Apr 1 19:32:57 2022 +0200

    - updated to 0.4.0, uses meson now
    - added meson patch (fixes doxygen target, adds executables install)

 libdsm-meson.patch | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 libdsm.spec        | 37 +++++++++++++++++++------------------
 2 files changed, 70 insertions(+), 18 deletions(-)
---
diff --git a/libdsm.spec b/libdsm.spec
index 3262fae..47e22e2 100644
--- a/libdsm.spec
+++ b/libdsm.spec
@@ -6,20 +6,24 @@
 Summary:	Minimalist and read-only SMB client library
 Summary(pl.UTF-8):	Minimalistyczna biblioteka klienta SMB (tylko do odczytu)
 Name:		libdsm
-Version:	0.3.2
+Version:	0.4.0
 Release:	1
 License:	LGPL v2.1+ or commercial
 Group:		Libraries
 #Source0Download: https://github.com/videolabs/libdsm/releases
-Source0:	https://github.com/videolabs/libdsm/releases/download/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	f369fed56ec61f08951363157b45c276
+Source0:	https://github.com/videolabs/libdsm/releases/download/v%{version}/%{name}-%{version}.tar.xz
+# Source0-md5:	6013fe1a64bca8268e197817c8645588
+Patch0:		%{name}-meson.patch
 URL:		https://videolabs.github.io/libdsm/
-#BuildRequires:	autoconf >= 2.53
-#BuildRequires:	automake >= 1:1.6
 %{?with_apidocs:BuildRequires:	doxygen}
 BuildRequires:	libbsd-devel
 BuildRequires:	libtasn1-devel >= 3.0
-#BuildRequires:	libtool >= 2:2
+BuildRequires:	meson >= 0.53.0
+BuildRequires:	ninja >= 1.5
+BuildRequires:	rpm-build >= 4.6
+BuildRequires:	rpmbuild(macros) >= 1.736
+BuildRequires:	tar >= 1:1.22
+BuildRequires:	xz
 Requires:	libtasn1 >= 3.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -63,6 +67,7 @@ Statyczna biblioteka liBDSM.
 Summary:	API documentation for liBDSM library
 Summary(pl.UTF-8):	Dokumentacja API biblioteki liBDSM
 Group:		Documentation
+BuildArch:	noarch
 
 %description apidocs
 API documentation for liBDSM library.
@@ -72,27 +77,23 @@ Dokumentacja API biblioteki liBDSM.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %{__sed} -ne '1,/^===/ p' COPYING > LICENSE
 
 %build
-%configure \
-	--disable-silent-rules \
-	%{!?with_static_libs:--disable-static}
-%{__make}
+%meson build \
+	%{!?with_static_libs:--default-library=shared}
 
-%if %{with apidocs}
-%{__make} doc
-%endif
+%ninja_build -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
+%ninja_install -C build
 
-# obsoleted by pkgconfig
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libdsm.la
+# packaged as %doc
+rm -rf $RPM_BUILD_ROOT%{_docdir}/libdsm
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -125,5 +126,5 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with apidocs}
 %files apidocs
 %defattr(644,root,root,755)
-%doc doc/html/*
+%doc build/html/*
 %endif
diff --git a/libdsm-meson.patch b/libdsm-meson.patch
new file mode 100644
index 0000000..5622b75
--- /dev/null
+++ b/libdsm-meson.patch
@@ -0,0 +1,51 @@
+--- libdsm-0.4.0/doc/Doxyfile.in.orig	2022-03-03 11:05:14.574187500 +0100
++++ libdsm-0.4.0/doc/Doxyfile.in	2022-04-01 06:18:53.121670869 +0200
+@@ -1009,7 +1009,7 @@ GENERATE_HTML          = YES
+ # The default directory is: html.
+ # This tag requires that the tag GENERATE_HTML is set to YES.
+ 
+-HTML_OUTPUT            = html
++HTML_OUTPUT            = ../html
+ 
+ # The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
+ # generated HTML page (for example: .htm, .php, .asp).
+--- libdsm-0.4.0/meson.build.orig	2022-04-01 06:23:05.352256769 +0200
++++ libdsm-0.4.0/meson.build	2022-04-01 06:23:13.973876755 +0200
+@@ -271,7 +271,7 @@ if doxygen.found()
+     configuration: doxygen_data,
+     install: false)
+   doc_dir = join_paths(get_option('datadir'), 'doc', 'libdsm')
+-  run_target('doc',
++  custom_target('doc',
+              command: [doxygen, doxyfile],
+              input: doxyfile,
+              output: 'html',
+--- libdsm-0.4.0/bin/meson.build.orig	2022-03-03 11:05:14.574187500 +0100
++++ libdsm-0.4.0/bin/meson.build	2022-04-01 06:26:12.527690929 +0200
+@@ -1,19 +1,23 @@
+ executable('dsm', 'dsm.c', 
+   include_directories: [includes],
++  install: true,
+   link_with: libdsm
+ )
+ 
+-executable('discover', 'discover.c',
++executable('dsm_discover', 'discover.c',
+   include_directories: [includes],
++  install: true,
+   link_with: libdsm
+ )
+ 
+-executable('inverse', 'inverse.c',
++executable('dsm_inverse', 'inverse.c',
+   include_directories: [includes],
++  install: true,
+   link_with: libdsm
+ )
+ 
+-executable('lookup', 'lookup.c',
++executable('dsm_lookup', 'lookup.c',
+   include_directories: [includes],
++  install: true,
+   link_with: libdsm
+ )
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libdsm.git/commitdiff/79dbeaba6652817ae304cf0c77cee117dbf3dfa2