From 8e72530f23568573ffb264db716a9cb4027029d1 Mon Sep 17 00:00:00 2001
From: eabdullin <ed.abdullin.1@gmail.com>
Date: Mon, 30 Sep 2024 15:57:10 +0000
Subject: [PATCH] import CS libtracefs-1.6.4-1.el9

---
 .gitignore                                    |  2 +-
 .libtracefs.metadata                          |  2 +-
 SOURCES/libtracefs-1.0.2-harden-linking.patch | 11 -----------
 SPECS/libtracefs.spec                         | 10 +++++-----
 4 files changed, 7 insertions(+), 18 deletions(-)
 delete mode 100644 SOURCES/libtracefs-1.0.2-harden-linking.patch

diff --git a/.gitignore b/.gitignore
index 4815b6c..6d3cddb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/libtracefs-1.3.1.tar.gz
+SOURCES/libtracefs-1.6.4.tar.gz
diff --git a/.libtracefs.metadata b/.libtracefs.metadata
index 72a8313..9f225cc 100644
--- a/.libtracefs.metadata
+++ b/.libtracefs.metadata
@@ -1 +1 @@
-400dc7422f22b86ab64f2adaaf0a2d106e4b0261 SOURCES/libtracefs-1.3.1.tar.gz
+66a7a64e69d049e52a61923e6b448dc42041c844 SOURCES/libtracefs-1.6.4.tar.gz
diff --git a/SOURCES/libtracefs-1.0.2-harden-linking.patch b/SOURCES/libtracefs-1.0.2-harden-linking.patch
deleted file mode 100644
index 878f74b..0000000
--- a/SOURCES/libtracefs-1.0.2-harden-linking.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/scripts/utils.mk
-+++ b/scripts/utils.mk
-@@ -56,7 +56,7 @@
- 
- do_compile_shared_library =			\
- 	($(print_shared_lib_compile)		\
--	$(CC) --shared $^ '-Wl,-soname,$(1),-rpath=$$ORIGIN' -o $@ $(LDFLAGS) $(LIBS))
-+	$(CC) --shared $^ '-Wl,-soname,$(1),-rpath=$$ORIGIN' -o $@ $(GCCLDFLAGS) $(LDFLAGS) $(LIBS))
- 
- do_compile_plugin_obj =				\
- 	($(print_plugin_obj_compile)		\
diff --git a/SPECS/libtracefs.spec b/SPECS/libtracefs.spec
index 09791de..1e97ce4 100644
--- a/SPECS/libtracefs.spec
+++ b/SPECS/libtracefs.spec
@@ -10,7 +10,7 @@
 %global _lto_cflags %nil
 
 Name: libtracefs
-Version: 1.3.1
+Version: 1.6.4
 Release: 1%{?dist}
 License: LGPLv2+ and GPLv2+
 Summary: Library for access kernel tracefs
@@ -23,7 +23,6 @@ URL: https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/
 #Source0: libtracefs-%%{version}.tar.gz
 #Source0: https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/snapshot/libtracefs-%%{commit}.tar.gz
 Source0: https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/snapshot/libtracefs-%{version}.tar.gz
-Patch0:  libtracefs-1.0.2-harden-linking.patch
 BuildRequires:  gcc
 BuildRequires:  make
 BuildRequires:  pkgconfig(libtraceevent)
@@ -42,7 +41,6 @@ Development headers of %{name}
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %set_build_flags
@@ -58,8 +56,7 @@ rm -rf %{buildroot}/%{_libdir}/libtracefs.a
 %files
 %license LICENSES/LGPL-2.1
 %license LICENSES/GPL-2.0
-%{_libdir}/%{name}.so.1
-%{_libdir}/%{name}.so.1.3.1
+%{_libdir}/%{name}.so.*
 
 %files devel
 %{_includedir}/tracefs/tracefs.h
@@ -67,6 +64,9 @@ rm -rf %{buildroot}/%{_libdir}/libtracefs.a
 %{_libdir}/%{name}.so
 
 %changelog
+* Fri Aug 16 2024 Jerome Marchand <jmarchan@redhat.com> - 1.6.4-1
+- Rebase to 1.6.4 (RHEL-36547)
+
 * Tue Aug 30 2022 Michael Petlan <mpetlan@redhat.com> - 1.3.1-1
 - Rebase to 1.3.1
   Related: rhbz#2075215