From 9e004e7d9fa25316487683326ed3e43e865a8e34 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sat, 6 Jan 2024 04:59:17 +0100 Subject: [PATCH] rebuilt with ttylock.h fixes and other specfile fixes [release 1.0.3_1.6-2mamba;Tue Aug 24 2021] --- liblockdev-1.0.3_1.6-gcc-11.0.patch | 15 +++++++++++++++ liblockdev.spec | 20 ++++++++++++++++---- 2 files changed, 31 insertions(+), 4 deletions(-) create mode 100644 liblockdev-1.0.3_1.6-gcc-11.0.patch diff --git a/liblockdev-1.0.3_1.6-gcc-11.0.patch b/liblockdev-1.0.3_1.6-gcc-11.0.patch new file mode 100644 index 0000000..fe0fd92 --- /dev/null +++ b/liblockdev-1.0.3_1.6-gcc-11.0.patch @@ -0,0 +1,15 @@ +--- lockdev-1.0.3/src/ttylock.h.orig 2021-08-24 19:07:37.210579510 +0200 ++++ lockdev-1.0.3/src/ttylock.h 2021-08-24 19:07:44.530692451 +0200 +@@ -36,12 +36,6 @@ + + /* API of the library */ + +-int ttylock (char * devname); +-int ttywait (char * devname); +-int ttyunlock (char * devname); +-int ttylocked (char * devname); +- +- + static inline int + ttylock(char *devname) + { diff --git a/liblockdev.spec b/liblockdev.spec index 8b3dc19..9bbcccf 100644 --- a/liblockdev.spec +++ b/liblockdev.spec @@ -3,13 +3,13 @@ %define minver %(echo %version | cut -d_ -f2) Name: liblockdev Version: 1.0.3_1.6 -Release: 1mamba +Release: 2mamba Summary: A library to put an exclusive lock to devices Group: System/Kernel and Hardware Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco -URL: http://ftp.debian.org/debian/pool/main/l/lockdev +URL: http://ftp.debian.org/debian/pool/main/l/lockdev/ Source: http://ftp.debian.org/debian/pool/main/l/lockdev/lockdev_%{majver}.orig.tar.gz Patch0: http://ftp.debian.org/debian/pool/main/l/lockdev/lockdev_%{majver}-%{minver}.diff.gz Patch1: %{name}-1.0.0-rh.patch @@ -17,10 +17,11 @@ Patch2: %{name}-1.0.0-shared.patch Patch3: %{name}-1.0.0-signal.patch Patch4: %{name}-1.0.0-cli.patch Patch5: %{name}-1.0.1-checkname.patch +Patch6: liblockdev-1.0.3_1.6-gcc-11.0.patch License: LGPL ## AUTOBUILDREQ-BEGIN +BuildRequires: glibc-devel ## AUTOBUILDREQ-END -BuildRoot: %{_tmppath}/%{name}-%{version}-root %description Lockdev provides a reliable way to put an exclusive lock to devices using _both_ FSSTND and SVr4 methods. @@ -34,6 +35,8 @@ Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release} Lockdev provides a reliable way to put an exclusive lock to devices using _both_ FSSTND and SVr4 methods. This package contains static libraries and header files need for development. +%debug_package + %prep %setup -q -n lockdev-%{majver} %patch0 -p1 @@ -42,6 +45,7 @@ This package contains static libraries and header files need for development. #%patch3 -p1 #%patch4 -p1 #%patch5 -p1 +%patch6 -p1 %build %make basedir=%{_prefix} CFLAGS="%{optflags} -fPIC" CC="%{_host}-gcc" \ @@ -53,9 +57,14 @@ This package contains static libraries and header files need for development. [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" make install basedir=%{buildroot}%{_prefix} libdir=%{buildroot}%{_libdir} -ln -s liblockdev.so.1.0.1 %{buildroot}%{_libdir}/liblockdev.so.1 +mv %{buildroot}%{_libdir}/liblockdev.%{majver}.so %{buildroot}%{_libdir}/liblockdev.so.%{majver} +ln -s liblockdev.so.%{majver} %{buildroot}%{_libdir}/liblockdev.so.1 +ln -s liblockdev.so.%{majver} %{buildroot}%{_libdir}/liblockdev.so + install -d %{buildroot}/var/lock/subsys +chmod +x %{buildroot}%{_libdir}/liblockdev.so.%{majver} + %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" @@ -82,6 +91,9 @@ fi %{_mandir}/man3/* %changelog +* Tue Aug 24 2021 Silvan Calarco 1.0.3_1.6-2mamba +- rebuilt with ttylock.h fixes and other specfile fixes + * Sun Nov 16 2014 Silvan Calarco 1.0.3_1.6-1mamba - update to 1.0.3_1.6