From 0477c748975717bf4c717d06ba178b5e9171cccb Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Wed, 10 May 2023 21:51:34 +0100 Subject: [PATCH 1/2] libmbus: RPM spec file fixes Fix 64-bit compilation (library location) and autoconfiscation of source code. --- libmbus.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/libmbus.spec b/libmbus.spec index 06160f75..79376641 100644 --- a/libmbus.spec +++ b/libmbus.spec @@ -13,7 +13,7 @@ Summary: Open source M-bus (Meter-Bus) library Name: libmbus Version: 0.9.0 Release: 1 -Source: https://github.com/rscada/%{name}/archive/%{version}.tar.gz +Source: https://github.com/marmaladelane/libmbus/archive/refs/heads/master.zip URL: https://github.com/rscada/libmbus/ License: BSD Vendor: Raditex Control AB @@ -46,12 +46,15 @@ This package contains all necessary include files and libraries needed to compile and link applications which use the M-bus (Meter-Bus) library. %prep -q -%setup -q -# workaround to get it's build +%setup -q -n libmbus-master +# workaround to get it to build: +libtoolize +autoreconf || true +automake --add-missing autoreconf %build -./configure --prefix=/usr +./configure --prefix=/usr --libdir=/usr/lib64 make %install @@ -68,7 +71,7 @@ rm -rf "%buildroot" %{_bindir}/mbus-serial-* %{_bindir}/mbus-tcp-* %{_libdir}/libmbus.so* -%{_mandir}/man1/libmbus.1 +%{_mandir}/man1/libmbus.1.gz %{_mandir}/man1/mbus-* %files devel From 0b603f878a89f9cc54672ec8e27237c5524e43b7 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Wed, 10 May 2023 21:51:34 +0100 Subject: [PATCH 2/2] libmbus: RPM spec file fixes Fix 64-bit compilation (library location) and autoconfiscation of source code. --- libmbus.spec | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/libmbus.spec b/libmbus.spec index 06160f75..0a2c2898 100644 --- a/libmbus.spec +++ b/libmbus.spec @@ -13,7 +13,7 @@ Summary: Open source M-bus (Meter-Bus) library Name: libmbus Version: 0.9.0 Release: 1 -Source: https://github.com/rscada/%{name}/archive/%{version}.tar.gz +Source: https://github.com/marmaladelane/libmbus/archive/refs/heads/master.zip URL: https://github.com/rscada/libmbus/ License: BSD Vendor: Raditex Control AB @@ -46,12 +46,15 @@ This package contains all necessary include files and libraries needed to compile and link applications which use the M-bus (Meter-Bus) library. %prep -q -%setup -q -# workaround to get it's build +%setup -q -n libmbus-master +# workaround to get it to build: +libtoolize +autoreconf || true +automake --add-missing autoreconf %build -./configure --prefix=/usr +./configure --prefix=/usr --libdir=/usr/lib64 make %install @@ -64,11 +67,11 @@ rm -rf "%buildroot" %files %defattr (-,root,root) -%doc COPYING README.md +%doc /usr/share/doc/%{name}-%{version} %{_bindir}/mbus-serial-* %{_bindir}/mbus-tcp-* %{_libdir}/libmbus.so* -%{_mandir}/man1/libmbus.1 +%{_mandir}/man1/libmbus.1.gz %{_mandir}/man1/mbus-* %files devel