rpms/composefs
7
0
Fork 0
Code Issues Pull Requests Releases Activity

composefs-1.0.5-1.el10

Browse Source 
- update to https://github.com/containers/composefs/releases/tag/v1.0.5
- Related: RHEL-34195

Signed-off-by: Jindrich Novy <jnovy@redhat.com>
This commit is contained in:
Jindrich Novy 2024-08-19 09:22:51 +02:00
parent b6dbea90e3
commit 372d85f8ba
5 changed files with 7 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored
View File

@ -1,4 +1 @@
/composefs-1.0.1.tar.xz
/composefs-1.0.2.tar.xz
/composefs-1.0.3.tar.xz
/composefs-1.0.4.tar.xz
/*.tar.*

54
227.patch
View File

@ -1,54 +0,0 @@
From 297fdf109a28d0b35a38659ce6a8962c15975a7f Mon Sep 17 00:00:00 2001
From: Yaakov Selkowitz <yselkowi@redhat.com>
Date: Thu, 9 Nov 2023 15:13:12 -0500
Subject: [PATCH] Use go-md2man for building manpages
go-md2man is already used by other containers components, and is
therefore available in the RHEL buildroot, where pandoc (due to its
build dependency on the GHC stack) is not.
Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
---
Removed conflicting composefs.spec.in hunk which is not useful here.
Makefile.am | 4 ++--
composefs.spec.in | 2 +-
configure.ac | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 753a5a8..2b456cb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,11 +28,11 @@ if ENABLE_MAN
man/%.1: man/%.md
mkdir -p man
- ${PANDOC} $+ -s -t man > $@
+ ${MD2MAN} -in $^ -out $@
man/%.5: man/%.md
mkdir -p man
- ${PANDOC} $+ -s -t man > $@
+ ${MD2MAN} -in $^ -out $@
man1_MANS = $(MAN1PAGES:.md=.1)
man5_MANS = $(MAN5PAGES:.md=.5)
diff --git a/configure.ac b/configure.ac
index 29f86af..40ea60d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -104,10 +104,10 @@ AC_ARG_ENABLE(man,
enable_man=maybe)
AS_IF([test "$enable_man" != no], [
- AC_PATH_PROG([PANDOC], [pandoc])
- AS_IF([test -z "$PANDOC"], [
+ AC_PATH_PROG([MD2MAN], [go-md2man])
+ AS_IF([test -z "$MD2MAN"], [
AS_IF([test "$enable_man" = yes], [
- AC_MSG_ERROR([pandoc is required for --enable-man])
+ AC_MSG_ERROR([go-md2man is required for --enable-man])
])
enable_man=no
],[

4
changelog
View File

@ -1,4 +0,0 @@
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.0.3-2
- Bump release for June 2024 mass rebuild
%autochangelog

8
composefs.spec
View File

@ -3,8 +3,8 @@
%endif
Name: composefs
Version: 1.0.4
Release: %autorelease
Version: 1.0.5
Release: 2%{?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
@ -79,4 +79,6 @@ rm -rf %{buildroot}%{_libdir}/libcomposefs.la
%endif
%changelog
%autochangelog
* Mon Aug 19 2024 Jindrich Novy <jnovy@redhat.com> - 1.0.5-2
- update to the latest upstream release https://github.com/containers/composefs/releases/tag/v1.0.5
- Related: RHEL-39410

2
sources
View File

@ -1 +1 @@
SHA512 (composefs-1.0.4.tar.xz) = 4db2cadbd8b53d8a4a70f44c9fe77dfffaee5b4a5c1d7d281c029dbf49ccc2aa6e0b3906b81e0d07607089669df270ef04cf16fc7769e21778454f22122ca928
SHA512 (composefs-1.0.5.tar.xz) = 74c6ce83bf2fb91b358833f6cd81d796b78cf4de09c6e2882d4433f9f6632272a7b586cce8da8e437de141bbdfed2c3a79499aedc0e16e7e36b5165f3138b032