From ed291560d02d94c69c148e41608187382c7bb3e6 Mon Sep 17 00:00:00 2001
From: eabdullin <ed.abdullin.1@gmail.com>
Date: Tue, 11 Mar 2025 07:06:24 +0000
Subject: [PATCH] import CS composefs-1.0.8-1.el9

---
 .composefs.metadata  |  2 +-
 .gitignore           |  2 +-
 SPECS/composefs.spec | 37 ++++++++++++++-----------------------
 3 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/.composefs.metadata b/.composefs.metadata
index d7a745a..582c297 100644
--- a/.composefs.metadata
+++ b/.composefs.metadata
@@ -1 +1 @@
-dc6faa76ba673ce5afa12c1bd81a936ffe56269e SOURCES/composefs-1.0.5.tar.xz
+95bda5494bf4d9cda85eee514e9acaa731e74f54 SOURCES/composefs-1.0.8.tar.xz
diff --git a/.gitignore b/.gitignore
index f1b8873..c78c3b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/composefs-1.0.5.tar.xz
+SOURCES/composefs-1.0.8.tar.xz
diff --git a/SPECS/composefs.spec b/SPECS/composefs.spec
index c70925b..ad7e336 100644
--- a/SPECS/composefs.spec
+++ b/SPECS/composefs.spec
@@ -3,15 +3,15 @@
 %endif
 
 Name:           composefs
-Version: 1.0.5
+Version:        1.0.8
 Release:        1%{?dist}
 Summary:        Tools to handle creating and mounting composefs images
 
-License:        GPL-3.0-or-later AND LGPL-2.0-or-later AND Apache-2.0
+License:        LGPL-2.1-or-later AND (GPL-2.0-only OR Apache-2.0)
 URL:            https://github.com/containers/composefs
 Source0:        https://github.com/containers/composefs/releases/download/v%{version}/%{name}-%{version}.tar.xz
 
-BuildRequires:  gcc automake libtool openssl-devel fuse3-devel
+BuildRequires:  gcc meson openssl-devel fuse3-devel
 %if %{with man}
 BuildRequires:  go-md2man
 %endif
@@ -36,28 +36,23 @@ Devel files for %{name}.
 
 %package        libs
 Summary:        Libraries for %{name}
-License:        LGPL-2.1-or-later AND (GPL-2.0-only OR Apache-2.0)
 
 %description    libs
 Library files for %{name}.
 
 %prep
 %autosetup -p1
-# for go-md2man patch
-autoreconf -fiv
 
 %build
-%configure \
-           --disable-static \
-%if %{with man}
-           --enable-man \
+%meson --default-library=shared -Dfuse=enabled \
+%if %{without man}
+  -Dman=disabled
 %endif
-           --with-fuse
-%make_build
+%meson_build
 
 %install
-%make_install
-rm -rf %{buildroot}%{_libdir}/libcomposefs.la
+%meson_install
+rm -v $RPM_BUILD_ROOT/%{_libdir}/libcomposefs*.a
 
 %files devel
 %{_includedir}/libcomposefs
@@ -65,11 +60,11 @@ rm -rf %{buildroot}%{_libdir}/libcomposefs.la
 %{_libdir}/pkgconfig/%{name}.pc
 
 %files libs
-%license COPYING COPYING.LIB COPYING.LESSERv3 COPYINGv3 LICENSE.Apache-2.0 BSD-2-Clause.txt
+%license COPYING COPYING.GPL-2.0-only COPYING.GPL-2.0-or-later COPYING.LGPL-2.1-or-later LICENSE.Apache-2.0 BSD-2-Clause.txt
 %{_libdir}/libcomposefs.so.*
 
 %files
-%license COPYING COPYING.LIB COPYING.LESSERv3 COPYINGv3 LICENSE.Apache-2.0 BSD-2-Clause.txt
+%license COPYING COPYING.GPL-2.0-only COPYING.GPL-2.0-or-later COPYING.LGPL-2.1-or-later LICENSE.Apache-2.0 BSD-2-Clause.txt
 %doc README.md
 %{_bindir}/mkcomposefs
 %{_bindir}/composefs-info
@@ -79,10 +74,6 @@ rm -rf %{buildroot}%{_libdir}/libcomposefs.la
 %endif
 
 %changelog
-* Wed Aug 21 2024 Jindrich Novy <jnovy@redhat.com> - 1.0.5-1
-- update to https://github.com/containers/composefs/releases/tag/v1.0.5
-- Related: RHEL-27608
-
-* Thu Feb 01 2024 Colin Walters <walters@verbum.org> - 1.0.3-2
-- Initial fork from c10s
-  Resolves: #RHELPLAN-169060
+* Fri Nov 29 2024 Jindrich Novy <jnovy@redhat.com> - 1.0.7-1
+- update to https://github.com/containers/composefs/releases/tag/v1.0.7
+- Related: RHEL-60277