Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package lockdev for openSUSE:Factory checked 
in at 2023-06-27 23:16:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/lockdev (Old)
 and      /work/SRC/openSUSE:Factory/.lockdev.new.15902 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "lockdev"

Tue Jun 27 23:16:21 2023 rev:25 rq:1095640 version:1.0.3_git201003141408

Changes:
--------
--- /work/SRC/openSUSE:Factory/lockdev/lockdev.changes  2018-08-06 
11:52:10.497025391 +0200
+++ /work/SRC/openSUSE:Factory/.lockdev.new.15902/lockdev.changes       
2023-06-27 23:16:30.043333018 +0200
@@ -1,0 +2,12 @@
+Thu Mar 31 18:36:12 UTC 2022 - Callum Farmer <gm...@opensuse.org>
+
+- lock group is created by system-group-hardware
+
+-------------------------------------------------------------------
+Mon Apr 27 13:01:23 UTC 2020 - Ludwig Nussel <lnus...@suse.de>
+
+- use sysusers mechanism to create lock group and tmpfiles for
+  /{var/,}run (boo#1078466)
+- add lockdev-debug.diff
+
+-------------------------------------------------------------------

New:
----
  lockdev-debug.diff
  tmpfiles-lockdev.conf

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ lockdev.spec ++++++
--- /var/tmp/diff_new_pack.MODK3f/_old  2023-06-27 23:16:30.975338502 +0200
+++ /var/tmp/diff_new_pack.MODK3f/_new  2023-06-27 23:16:30.987338573 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package lockdev
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,35 +12,36 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
 %bcond_with lockdev_debug
-
 Name:           lockdev
+Version:        1.0.3_git201003141408
+Release:        0
 Summary:        A library for locking devices
 License:        LGPL-2.0-only
 Group:          System/Base
-Version:        1.0.3_git201003141408
-Release:        0
-Url:            http://packages.debian.org/unstable/source/lockdev
+URL:            https://packages.debian.org/unstable/source/lockdev
 #Source0:        
http://ftp.debian.org/debian/pool/main/l/lockdev/%{name}_%{version}.orig.tar.gz
 Source0:        
http://ftp.debian.org/debian/pool/main/l/lockdev/%{name}-%{version}.tar.bz2
+Source21:       tmpfiles-lockdev.conf
 Source90:       baselibs.conf
 Patch0:         lockdev-drop-baudboy.h.diff
 Patch1:         lockdev-fix-implicit-declarations.diff
 Patch2:         lockdev-reserve-some-space-to-avoid-buffer-overflow.diff
 Patch3:         lockdev-pie.diff
 Patch4:         sysmacros.patch
-#
-Requires(pre):  pwdutils permissions
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Patch5:         lockdev-debug.diff
 #
 BuildRequires:  libtool
 BuildRequires:  perl
-BuildRequires:  pkg-config
+BuildRequires:  pkgconfig
+BuildRequires:  systemd-rpm-macros
 BuildRequires:  perl(ExtUtils::MakeMaker)
+Requires(pre):  permissions
+Requires(pre):  group(lock)
 
 %description
 Lockdev provides a reliable way to put an exclusive lock to devices
@@ -49,9 +50,9 @@
 %package -n liblockdev1
 Summary:        The header files for the lockdev library
 Group:          System/Base
-Requires:       /usr/sbin/lockdev
+Requires:       %{_sbindir}/lockdev
 Requires(post): glibc
-Requires(postun): glibc
+Requires(postun):glibc
 
 %description -n liblockdev1
 Lockdev provides a reliable way to put an exclusive lock to devices
@@ -61,7 +62,7 @@
 Summary:        A library for locking devices
 Group:          Development/Libraries/C and C++
 Requires:       lockdev = %{version}
-Recommends:     pkg-config
+Recommends:     pkgconfig
 
 %description devel
 The lockdev library provides a reliable way to put an exclusive lock
@@ -69,17 +70,12 @@
 package contains the development headers.
 
 %prep
-%setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
+%autosetup -p1
 
 %build
 cat > VERSION <<EOF
 Package: lockdev
-Version: %version
+Version:        %{version}
 Release-Date: Unreleased
 Released-By: Unreleased
 EOF
@@ -92,46 +88,40 @@
        %{?with_lockdev_debug:--enable-debug}
 #
 make %{?_smp_mflags}
+#
 
 %check
 objdump -p src/.libs/lockdev | grep -q "NEEDED.*liblockdev.so.1"
 
 %install
-%makeinstall
+%make_install
 #
 # no need for this
-rm -f %{buildroot}/%{_libdir}/*.la
+find %{buildroot} -type f -name "*.la" -delete -print
 #
-mkdir -p $RPM_BUILD_ROOT/var/lock
-
-%pre
-getent group lock >/dev/null || groupadd -r lock || :
+install -D -m644 %{SOURCE21} %{buildroot}%{_tmpfilesdir}/lockdev.conf
 
 %post
-%set_permissions /usr/sbin/lockdev
+%tmpfiles_create lockdev.conf
+%set_permissions %{_sbindir}/lockdev
 
 %post -n liblockdev1 -p /sbin/ldconfig
-
 %postun -n liblockdev1 -p /sbin/ldconfig
 
 %verifyscript
-%verify_permissions -e /usr/sbin/lockdev
-
-%clean
-rm -fr $RPM_BUILD_ROOT
+%verify_permissions -e %{_sbindir}/lockdev
 
 %files
-%defattr(-,root,root)
-%doc COPYING AUTHORS
+%license COPYING
+%doc AUTHORS
 %verify(not mode) %attr(2755,root,lock) %{_sbindir}/lockdev
 %{_mandir}/man8/*
+%{_tmpfilesdir}/lockdev.conf
 
 %files -n liblockdev1
-%defattr(-,root,root)
 %{_libdir}/*.so.*
 
 %files devel
-%defattr(-,root,root)
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/lockdev.pc
 %{_mandir}/man3/*

++++++ lockdev-debug.diff ++++++
Index: lockdev-1.0.3_git201003141408/src/lockdev.c
===================================================================
--- lockdev-1.0.3_git201003141408.orig/src/lockdev.c
+++ lockdev-1.0.3_git201003141408/src/lockdev.c
@@ -154,7 +154,7 @@ static inline       int     _dl_pid_exists          ( pid_
 
 #if DEBUG
 static int     liblockdev_debug = DEBUG;       /* 1 by default */
-#      define  _debug(val,fmt,arg...)  (liblockdev_debug && (liblockdev_debug 
>= val) && printf(fmt,##arg))
+#      define  _debug(val,fmt,arg...)  do { if (liblockdev_debug && 
(liblockdev_debug >= val)) { printf(fmt,##arg); } } while(0)
 static int     env_var_debug = -1;             /* record set from env var */
 #      define  _env_var        "LIBLOCKDEV_DEBUG"
 #else

++++++ tmpfiles-lockdev.conf ++++++
d /run/lock 0775 root lock -
L /var/lock - - - - ../run/lock

Reply via email to