[rpms/qrtr] epel10: Update to 1.1, move to meson build

[rpms/qrtr] epel10: Update to 1.1, move to meson build

[Peter Robinson]

A new commit has been pushed.

Repo   : rpms/qrtr
Branch : epel10
Commit : 4cfc9bd13eea8ebce45875da4ab25588d4f93971
Author : Peter Robinson <pbrobinson@gmail.com>
Date   : 2024-08-01T10:32:33+01:00
Stats  : +58/-64 in 6 file(s)
URL    : https://src.fedoraproject.org/rpms/qrtr/c/4cfc9bd13eea8ebce45875da4ab25588d4f93971?branch=epel10

Log:
Update to 1.1, move to meson build

---
diff --git a/.gitignore b/.gitignore
index be0ead8..8b0f6d7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/qrtr-1.0.tar.gz
+/qrtr-*.tar.gz

diff --git a/a4398c8bf271f90338f95e1230373dde977d9cff.patch b/a4398c8bf271f90338f95e1230373dde977d9cff.patch
deleted file mode 100644
index fe94b2e..0000000
--- a/a4398c8bf271f90338f95e1230373dde977d9cff.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From a4398c8bf271f90338f95e1230373dde977d9cff Mon Sep 17 00:00:00 2001
-From: Jami Kettunen <jami.kettunen@protonmail.com>
-Date: Wed, 28 Dec 2022 17:29:20 +0200
-Subject: [PATCH] Makefile: allow $(CFLAGS), $(LDFLAGS) override
-
-The caller might have specified CFLAGS or LDFLAGS. Let's respect those.
-Additionally drop LDFLAGS var definition as it is empty.
----
- Makefile | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 036691c..bd6c1cd 100644
---- a/Makefile
-+++ b/Makefile
-@@ -3,10 +3,9 @@ proj-major := 1
- proj-minor := 0
- proj-version := $(proj-major).$(proj-minor)
- 
--CFLAGS := -Wall -g
--LDFLAGS :=
-+CFLAGS += -Wall -g
-+prefix = /usr/local
- 
--prefix := /usr/local
- bindir := $(prefix)/bin
- libdir := $(prefix)/lib
- includedir := $(prefix)/include

diff --git a/d0d471c96e7d112fac6f48bd11f9e8ce209c04d2.patch b/d0d471c96e7d112fac6f48bd11f9e8ce209c04d2.patch
deleted file mode 100644
index bab95b8..0000000
--- a/d0d471c96e7d112fac6f48bd11f9e8ce209c04d2.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From d0d471c96e7d112fac6f48bd11f9e8ce209c04d2 Mon Sep 17 00:00:00 2001
-From: Dylan Van Assche <me@dylanvanassche.be>
-Date: Wed, 21 Dec 2022 20:25:11 +0100
-Subject: [PATCH] lookup: add Snapdragon Sensor Core service
-
-SDM845 and later expose a Snapdragon Sensor Core service (400) to access the sensors
- managed by a remoteproc. Add this service to the known list of services.
-
-Signed-off-by: Dylan Van Assche <me@dylanvanassche.be>
----
- src/lookup.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/lookup.c b/src/lookup.c
-index 80cf984..092e616 100644
---- a/src/lookup.c
-+++ b/src/lookup.c
-@@ -75,6 +75,7 @@ static const struct {
- 	{ 225, 0, "Remote Management Service" },
- 	{ 226, 0, "Open Mobile Alliance device management service" },
- 	{ 312, 0, "QBT1000 Ultrasonic Fingerprint Sensor service" },
-+	{ 400, 0, "Snapdragon Sensor Core service" },
- 	{ 769, 0, "SLIMbus control service" },
- 	{ 771, 0, "Peripheral Access Control Manager service" },
- 	{ 4096, 0, "TFTP" },

diff --git a/qrtr-restore-soname.patch b/qrtr-restore-soname.patch
new file mode 100644
index 0000000..129f3c5
--- /dev/null
+++ b/qrtr-restore-soname.patch
@@ -0,0 +1,46 @@
+From b6b586f3d099dff7c56b69c824a1931ddad170a4 Mon Sep 17 00:00:00 2001
+From: Arnaud Ferraris <arnaud.ferraris@collabora.com>
+Date: Tue, 23 Apr 2024 16:04:08 +0200
+Subject: [PATCH] lib: meson.build: restore libqrtr SONAME
+
+The previous version of `libqrtr` had `libqrtr.so.1` as their SONAME,
+while the current version have only `libqrtr.so`. This is problematic as
+previously built binaries using this lib will have to be rebuilt for
+this new version (or rather, re-linked, which is practically
+equivalent).
+
+This change ensures the SONAME is kept by setting the project version
+in the top-level `meson.build` and uses this string as the shared
+library version.
+
+In practice, the generated library filename is now `libqrtr.so.1.1` with
+SONAME still being `libqrtr.so.1`.
+---
+ lib/meson.build | 1 +
+ meson.build     | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/lib/meson.build b/lib/meson.build
+index 7a894b3..aab46cb 100644
+--- a/lib/meson.build
++++ b/lib/meson.build
+@@ -5,6 +5,7 @@ pkg = import('pkgconfig')
+ libqrtr_srcs = ['logging.c', 'qmi.c', 'qrtr.c']
+ libqrtr = shared_library('qrtr',
+                          libqrtr_srcs,
++                         version: meson.project_version(),
+                          include_directories : inc,
+                          install: true)
+ 
+diff --git a/meson.build b/meson.build
+index 4478263..0afaf84 100644
+--- a/meson.build
++++ b/meson.build
+@@ -2,6 +2,7 @@
+ 
+ project('qrtr',
+         'c',
++        version: '1.1',
+         license : [ 'BSD-3-Clause'],
+         default_options : [
+         'warning_level=1',

diff --git a/qrtr.spec b/qrtr.spec
index ee08d58..9c77762 100644
--- a/qrtr.spec
+++ b/qrtr.spec
@@ -1,19 +1,18 @@
 Name:           qrtr
-Version:        1.0
+Version:        1.1
 Release:        %autorelease
 Summary:        Service listing daemon for Qualcomm IPC Router
 
 # src/map.c is BSD-2-Clause, the rest is BSD-3-Clause
 License:        BSD-3-Clause AND BSD-2-Clause
-URL:            https://github.com/andersson/qrtr
+URL:            https://github.com/linux-msm/qrtr
 Source:         %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
-# Makefile: allow $(CFLAGS), $(LDFLAGS) override
-Patch:          %{url}/commit/a4398c8bf271f90338f95e1230373dde977d9cff.patch
-# lookup: add Snapdragon Sensor Core service
-Patch:          %{url}/commit/d0d471c96e7d112fac6f48bd11f9e8ce209c04d2.patch
+Patch1:         qrtr-restore-soname.patch
 
 BuildRequires:  gcc
-BuildRequires:  make
+BuildRequires:  meson
+BuildRequires:  systemd
+BuildRequires:  systemd-devel
 BuildRequires:  systemd-rpm-macros
 
 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
@@ -39,10 +38,11 @@ This packages provides development headers and libraries for %{name}.
 %autosetup -p1
 
 %build
-%make_build prefix="%{_prefix}" libdir="%{_libdir}"
+%meson -Dsystemd-unit-prefix=%{_unitdir}
+%meson_build
 
 %install
-%make_install prefix="%{_prefix}" libdir="%{_libdir}"
+%meson_install
 
 %post
 %systemd_post qrtr-ns.service
@@ -62,6 +62,7 @@ This packages provides development headers and libraries for %{name}.
 %files devel
 %{_includedir}/libqrtr.h
 %{_libdir}/libqrtr.so
+%{_libdir}/pkgconfig/qrtr.pc
 
 %files libs
 %license LICENSE

diff --git a/sources b/sources
index 9b40fa6..d909036 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qrtr-1.0.tar.gz) = 67d1da9821dc6589504d9d04ad8efbb589f81db70e1fbcdbf5f8ae809428967f09c070c62233a296f39909f4313db8d2215507d3612ff3d8f2d87c4513abe324
+SHA512 (qrtr-1.1.tar.gz) = 68cc8731d500b2e7f5702471a3c239f415bd97035678d972d40d28ceb58bcaa1ee271816fd2002776a2d370611fc9e5e54a79d1a16ce2bce258b9411d9aec824