From bf240d0fb9ad6f19adbaaac63b6bc1f1a7e14ce3 Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Fri, 5 Jan 2024 18:52:54 +0100
Subject: [PATCH] update to 2.34 provide/obsolete schedutils [release
 2.34-1mamba;Thu Aug 01 2019]

---
 ...inux-2.24.2-blkid-pkgconfig-add-uuid.patch |  9 -------
 ...-linux-2.34-blkid-pkgconfig-add-uuid.patch |  8 ++++++
 util-linux.spec                               | 27 ++++++++++++++-----
 3 files changed, 29 insertions(+), 15 deletions(-)
 delete mode 100644 util-linux-2.24.2-blkid-pkgconfig-add-uuid.patch
 create mode 100644 util-linux-2.34-blkid-pkgconfig-add-uuid.patch

diff --git a/util-linux-2.24.2-blkid-pkgconfig-add-uuid.patch b/util-linux-2.24.2-blkid-pkgconfig-add-uuid.patch
deleted file mode 100644
index d73a194..0000000
--- a/util-linux-2.24.2-blkid-pkgconfig-add-uuid.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -Nru util-linux-2.24.2.orig/libblkid/blkid.pc.in util-linux-2.24.2/libblkid/blkid.pc.in
---- util-linux-2.24.2.orig/libblkid/blkid.pc.in	2013-02-27 17:46:29.858020511 +0100
-+++ util-linux-2.24.2/libblkid/blkid.pc.in	2014-06-26 00:18:50.143819498 +0200
-@@ -8,4 +8,4 @@
- Version: @LIBBLKID_VERSION@
- Requires.private: uuid
- Cflags: -I${includedir}/blkid
--Libs: -L${libdir} -lblkid
-+Libs: -L${libdir} -lblkid -luuid
diff --git a/util-linux-2.34-blkid-pkgconfig-add-uuid.patch b/util-linux-2.34-blkid-pkgconfig-add-uuid.patch
new file mode 100644
index 0000000..797a476
--- /dev/null
+++ b/util-linux-2.34-blkid-pkgconfig-add-uuid.patch
@@ -0,0 +1,8 @@
+--- util-linux-2.34/libblkid/blkid.pc.in.orig	2019-08-01 21:26:03.746000000 +0200
++++ util-linux-2.34/libblkid/blkid.pc.in	2019-08-01 21:26:21.805000000 +0200
+@@ -7,4 +7,4 @@
+ Description: Block device id library
+ Version: @LIBBLKID_VERSION@
+ Cflags: -I${includedir}/blkid
+-Libs: -L${libdir} -lblkid
++Libs: -L${libdir} -lblkid -luuid
diff --git a/util-linux.spec b/util-linux.spec
index a3b051e..59c8538 100644
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -7,7 +7,7 @@
 %define uuidd_userid           65052
 
 Name:          util-linux
-Version:       2.33.2
+Version:       2.34
 Release:       1mamba
 Epoch:         1
 Summary:       Miscellaneous utilities for Linux
@@ -33,7 +33,7 @@ Source13:      util-linux-pam-chsh
 Patch0:        %{name}-ng-2.12q-adjtime_path.patch
 Patch1:        %{name}-ng-2.15-reiserfs_fix_name.patch
 Patch2:        util-linux-2.22-su_paths.patch
-Patch3:        util-linux-2.24.2-blkid-pkgconfig-add-uuid.patch
+Patch3:        util-linux-2.34-blkid-pkgconfig-add-uuid.patch
 License:       GPL
 ## AUTOBUILDREQ-BEGIN
 BuildRequires: glibc-devel
@@ -73,6 +73,8 @@ Provides:      uuidd
 Obsoletes:     uuidd
 Provides:      eject
 Obsoletes:     eject
+Provides:      schedutils
+Obsoletes:     schedutils
 Requires:      libuuid  = %{?epoch:%epoch:}%{version}-%{release}
 Requires:      libblkid = %{?epoch:%epoch:}%{version}-%{release}
 Requires:      libmount = %{?epoch:%epoch:}%{version}-%{release}
@@ -271,10 +273,18 @@ install -d %{buildroot}%{_localstatedir}/uuid
 exit 0
 
 %post
-%systemd_post
-if [ $1 -ge 1 ]; then
-   systemctl -q enable fstrim.timer
-fi
+%systemd_post fstrim.timer
+%systemd_post uuidd.socket
+:
+
+%preun
+%systemd_preun fstrim.timer
+%systemd_preun uuidd.socket
+:
+
+%postun
+%systemd_postun fstrim.timer
+%systemd_postun uuidd.socket
 :
 
 %post -n libblkid -p /sbin/ldconfig
@@ -368,6 +378,7 @@ fi
 %{_bindir}/fincore
 %{_bindir}/flock
 %{_bindir}/getopt
+%{_bindir}/hardlink
 %{_bindir}/hexdump
 %ifarch i586 x86_64
 %{_bindir}/i386
@@ -525,6 +536,10 @@ fi
 %{_libdir}/pkgconfig/fdisk.pc
 
 %changelog
+* Thu Aug 01 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 2.34-1mamba
+- update to 2.34
+- provide/obsolete schedutils
+
 * Tue Apr 09 2019 Automatic Build System <autodist@mambasoft.it> 2.33.2-1mamba
 - automatic version update by autodist