The package rpms/composefs.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/composefs.git/commit/?id=c840e749...
https://src.fedoraproject.org/cgit/rpms/composefs.git/commit/?id=b95af996....
Change:
-ExcludeArch: %{ix86}
+ExcludeArch: %{ix86}
Thanks.
Full change:
============
commit eaa691b7ad8a74ad71d091abc72f24c8b658ecfa
Author: Stephen Smoogen <ssmoogen(a)redhat.com>
Date: Mon Jan 29 10:48:40 2024 -0500
Remove patch integrated into upstream.
diff --git a/227.patch b/227.patch
deleted file mode 100644
index 3baff01..0000000
--- a/227.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 297fdf109a28d0b35a38659ce6a8962c15975a7f Mon Sep 17 00:00:00 2001
-From: Yaakov Selkowitz <yselkowi(a)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(a)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
- ],[
commit 3fec4b51c984bea6627a2fc41f597d0a0bef4670
Author: Stephen Smoogen <ssmoogen(a)redhat.com>
Date: Mon Jan 29 10:21:36 2024 -0500
Update to upstream 1.0.3
- Changes since 1.0.2:
* Image format version 1 was added that allows storing overlay whiteouts in
a composefs image.
* libcomposefs added max_version option
* mkcomposefs added --version and --max-version options
* composefs can now be build without go-md2man
* Minor bugfix handling file read errors
Signed-off-by: Stephen Smoogen <ssmoogen(a)redhat.com>
diff --git a/.gitignore b/.gitignore
index f71f28c..5841a71 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/composefs-1.0.1.tar.xz
/composefs-1.0.2.tar.xz
+/composefs-1.0.3.tar.xz
diff --git a/composefs.spec b/composefs.spec
index 689f599..c4621d0 100644
--- a/composefs.spec
+++ b/composefs.spec
@@ -3,8 +3,8 @@
%endif
Name: composefs
-Version: 1.0.2
-Release: 4%{?dist}
+Version: 1.0.3
+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
@@ -79,11 +79,4 @@ rm -rf %{buildroot}%{_libdir}/libcomposefs.la
%endif
%changelog
-* Wed Jan 24 2024 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0.2-4
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Jan 19 2024 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0.2-3
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-
%autochangelog
diff --git a/sources b/sources
index fac7e2b..8213659 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composefs-1.0.2.tar.xz) =
b9c8fcf3f488e4707ee44a27aafc1c2e8a23f7e1f6b6486c168f49b8fc31b1fe28a00bc45b5256746053233d874466a114b0ad470521adec3d0da28b02799946
+SHA512 (composefs-1.0.3.tar.xz) =
314e8e3230d4a97f1c7770c38427c14688adabb05e3ba03b94f36c174608556e961165be084e9d11207da87eb0626d584b285ba6ff0d82250284c499e413bf02
commit 9f2be45e0dd4221d9a4f75afc82bfb7c6840c3ef
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Wed Jan 24 07:53:53 2024 +0000
Rebuilt for
https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
diff --git a/composefs.spec b/composefs.spec
index d706551..689f599 100644
--- a/composefs.spec
+++ b/composefs.spec
@@ -4,7 +4,7 @@
Name: composefs
Version: 1.0.2
-Release: 3%{?dist}
+Release: 4%{?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,6 +79,9 @@ rm -rf %{buildroot}%{_libdir}/libcomposefs.la
%endif
%changelog
+* Wed Jan 24 2024 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0.2-4
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
* Fri Jan 19 2024 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0.2-3
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
commit bc817ad62fce5bfbc41251aff039847d4261b86a
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Jan 19 16:03:18 2024 +0000
Rebuilt for
https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
diff --git a/composefs.spec b/composefs.spec
index a8fc659..d706551 100644
--- a/composefs.spec
+++ b/composefs.spec
@@ -4,7 +4,7 @@
Name: composefs
Version: 1.0.2
-Release: 2%{?dist}
+Release: 3%{?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,5 +79,8 @@ rm -rf %{buildroot}%{_libdir}/libcomposefs.la
%endif
%changelog
+* Fri Jan 19 2024 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0.2-3
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
%autochangelog
commit c840e7496ad9a0a008903a4cfe5d38c22f49fd54
Author: Yaakov Selkowitz <yselkowi(a)redhat.com>
Date: Mon Jan 15 09:45:56 2024 -0500
Enable build on i686 without manpages
The cascade of packages which suddenly do not build on i686 due to the
introduction of composefs as a dependency is causing issues. Instead,
allow this to be built without manpages.
https://github.com/containers/composefs/pull/236
diff --git a/composefs.spec b/composefs.spec
index 3c04ea0..a8fc659 100644
--- a/composefs.spec
+++ b/composefs.spec
@@ -1,19 +1,23 @@
+%ifarch %{golang_arches}
+%bcond man 1
+%endif
+
Name: composefs
Version: 1.0.2
-Release: 1%{?dist}
+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
URL:
https://github.com/containers/composefs
Source0:
https://github.com/containers/composefs/releases/download/v%{version}/%{n...
-BuildRequires: gcc automake libtool openssl-devel go-md2man fuse3-devel
+BuildRequires: gcc automake libtool openssl-devel fuse3-devel
+%if %{with man}
+BuildRequires: go-md2man
+%endif
Requires: %{name}-libs = %{version}-%{release}
-#
https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
-ExcludeArch: %{ix86}
-
%description
Tools to handle creating and mounting composefs images. The composefs
project combines several underlying Linux features to provide a very
@@ -45,7 +49,9 @@ autoreconf -fiv
%build
%configure \
--disable-static \
+%if %{with man}
--enable-man \
+%endif
--with-fuse
%make_build
@@ -68,7 +74,9 @@ rm -rf %{buildroot}%{_libdir}/libcomposefs.la
%{_bindir}/mkcomposefs
%{_bindir}/composefs-info
%{_sbindir}/mount.composefs
+%if %{with man}
%{_mandir}/man*/*
+%endif
%changelog
commit b1d100b4a443f8f09e07020c57b9a4e65e0a75ca
Author: Stephen Smoogen <ssmoogen(a)redhat.com>
Date: Thu Dec 14 14:28:34 2023 -0500
Remove patch 227 from the build as it is no longer needed.
diff --git a/composefs.spec b/composefs.spec
index bde6cf4..3c04ea0 100644
--- a/composefs.spec
+++ b/composefs.spec
@@ -6,9 +6,6 @@ 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
URL:
https://github.com/containers/composefs
Source0:
https://github.com/containers/composefs/releases/download/v%{version}/%{n...
-# Use go-md2man instead of pandoc for building manpages
-#
https://github.com/containers/composefs/pull/227 (backported)
-Patch0: 227.patch
BuildRequires: gcc automake libtool openssl-devel go-md2man fuse3-devel
commit a3f10c15d6c8fc6d86b01d0e48a692e34064b548
Author: Stephen Smoogen <ssmoogen(a)redhat.com>
Date: Thu Dec 14 14:23:38 2023 -0500
Update to 1.0.2
* Dropped composefs-from-json in tests in favour of using the
composefs-info dump format.
* libyajl dependency dropped
* libcomposefs now limits the number of xattrs per file to 64k
* Fixed build against libc without reallocarray
* Performance fixes
* go-md2man is used instead of pandoc for manpages
* Minor fixes to spec file
diff --git a/.gitignore b/.gitignore
index 7b15e0d..f71f28c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/composefs-1.0.1.tar.xz
+/composefs-1.0.2.tar.xz
diff --git a/composefs.spec b/composefs.spec
index 046fb75..bde6cf4 100644
--- a/composefs.spec
+++ b/composefs.spec
@@ -1,6 +1,6 @@
Name: composefs
-Version: 1.0.1
-Release: 4%{?dist}
+Version: 1.0.2
+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
@@ -10,7 +10,8 @@ Source0:
https://github.com/containers/composefs/releases/download/v%{ver
#
https://github.com/containers/composefs/pull/227 (backported)
Patch0: 227.patch
-BuildRequires: gcc automake libtool openssl-devel yajl-devel go-md2man fuse3-devel
+BuildRequires: gcc automake libtool openssl-devel go-md2man fuse3-devel
+
Requires: %{name}-libs = %{version}-%{release}
#
https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
@@ -48,7 +49,6 @@ autoreconf -fiv
%configure \
--disable-static \
--enable-man \
- --with-yajl \
--with-fuse
%make_build
@@ -66,6 +66,7 @@ rm -rf %{buildroot}%{_libdir}/libcomposefs.la
%{_libdir}/libcomposefs.so.*
%files
+%license COPYING COPYING.LIB COPYING.LESSERv3 COPYINGv3 LICENSE.Apache-2.0
BSD-2-Clause.txt
%doc README.md
%{_bindir}/mkcomposefs
%{_bindir}/composefs-info
@@ -73,4 +74,5 @@ rm -rf %{buildroot}%{_libdir}/libcomposefs.la
%{_mandir}/man*/*
%changelog
+
%autochangelog
diff --git a/sources b/sources
index ddf4df8..fac7e2b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (composefs-1.0.1.tar.xz) =
0df27af756f70a9a4961a6dd839e354359efffede2f7f8d21c40ddf6dd5d750d52d56b90b4a6d4f48ffa8fb1b3df6b4efd43508a330342de4753fcc35427b9e7
+SHA512 (composefs-1.0.2.tar.xz) =
b9c8fcf3f488e4707ee44a27aafc1c2e8a23f7e1f6b6486c168f49b8fc31b1fe28a00bc45b5256746053233d874466a114b0ad470521adec3d0da28b02799946
commit b95af99620d8c98cad2a5a39fd7bcd9ee889432d
Author: Yaakov Selkowitz <yselkowi(a)redhat.com>
Date: Fri Nov 10 14:00:24 2023 -0500
Drop i686
https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
https://github.com/containers/composefs/pull/229
diff --git a/composefs.spec b/composefs.spec
index 9f50a17..046fb75 100644
--- a/composefs.spec
+++ b/composefs.spec
@@ -13,6 +13,9 @@ Patch0: 227.patch
BuildRequires: gcc automake libtool openssl-devel yajl-devel go-md2man fuse3-devel
Requires: %{name}-libs = %{version}-%{release}
+#
https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
+ExcludeArch: %{ix86}
+
%description
Tools to handle creating and mounting composefs images. The composefs
project combines several underlying Linux features to provide a very
commit ce23e6b14caf51b25c973dd0de53a4acc440a2c5
Author: Yaakov Selkowitz <yselkowi(a)redhat.com>
Date: Thu Nov 9 15:30:31 2023 -0500
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.
https://github.com/containers/composefs/pull/227
diff --git a/227.patch b/227.patch
new file mode 100644
index 0000000..3baff01
--- /dev/null
+++ b/227.patch
@@ -0,0 +1,54 @@
+From 297fdf109a28d0b35a38659ce6a8962c15975a7f Mon Sep 17 00:00:00 2001
+From: Yaakov Selkowitz <yselkowi(a)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(a)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
+ ],[
diff --git a/composefs.spec b/composefs.spec
index 7c7e55c..9f50a17 100644
--- a/composefs.spec
+++ b/composefs.spec
@@ -1,13 +1,16 @@
Name: composefs
Version: 1.0.1
-Release: 3%{?dist}
+Release: 4%{?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
URL:
https://github.com/containers/composefs
Source0:
https://github.com/containers/composefs/releases/download/v%{version}/%{n...
+# Use go-md2man instead of pandoc for building manpages
+#
https://github.com/containers/composefs/pull/227 (backported)
+Patch0: 227.patch
-BuildRequires: gcc automake libtool openssl-devel yajl-devel pandoc fuse3-devel
+BuildRequires: gcc automake libtool openssl-devel yajl-devel go-md2man fuse3-devel
Requires: %{name}-libs = %{version}-%{release}
%description
@@ -34,7 +37,9 @@ License: LGPL-2.1-or-later AND (GPL-2.0-only OR Apache-2.0)
Library files for %{name}.
%prep
-%autosetup
+%autosetup -p1
+# for go-md2man patch
+autoreconf -fiv
%build
%configure \
commit 7029d3d17051e058998a968eb1bddb5e49141c7f
Author: Colin Walters <walters(a)verbum.org>
Date: Mon Nov 6 14:44:17 2023 -0500
Use `%autochangelog`
Because it's way less annoying.
diff --git a/composefs.spec b/composefs.spec
index 65e0a45..7c7e55c 100644
--- a/composefs.spec
+++ b/composefs.spec
@@ -1,6 +1,6 @@
Name: composefs
Version: 1.0.1
-Release: 2%{?dist}
+Release: 3%{?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
@@ -65,13 +65,4 @@ rm -rf %{buildroot}%{_libdir}/libcomposefs.la
%{_mandir}/man*/*
%changelog
-* Mon Oct 16 2023 Stephen Smoogen <smooge(a)fedoraproject.org> - 1.0.1-2
-- Take in fixes from reviwers to fix man page compression types
-- Take in fixes from reviwers to move licenses to lib subpackage
-
-* Fri Oct 13 2023 Stephen Smoogen <smooge(a)fedoraproject.org> - 1.0.1-1
-- Update to 1.0.1
-- Confirm license is in SPDX format
-
-* Fri Apr 21 2023 Alexander Larsson <alexl(a)redhat.com>
-- Initial version
+%autochangelog
commit 13c7347ea5e14161c18d960a7e94b7bac5b3fdce
Author: Colin Walters <walters(a)verbum.org>
Date: Mon Nov 6 14:41:59 2023 -0500
Add a requirement from -devel to -libs
To silence an rpmdeps warning which is spurious, but it doesn't
realize we already handle this through the main package.
```
Subpackage composefs-devel on i686 carries 'Requires: libcomposefs.so.1'
which comes from subpackage composefs-libs but does not carry an explicit package version
requirement. Please add 'Requires: composefs-libs = %{version}-%{release}' to the
spec file to avoid the need to test interoperability between various combinations of old
and new subpackages.
```
diff --git a/composefs.spec b/composefs.spec
index c5b0a27..65e0a45 100644
--- a/composefs.spec
+++ b/composefs.spec
@@ -21,6 +21,7 @@ Please see
https://github.com/containers/composefs for more
information.
%package devel
Summary: Devel files for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%description devel
Devel files for %{name}.