Compare commits

...

No commits in common. "c8" and "c10s" have entirely different histories.
c8 ... c10s

11 changed files with 170 additions and 40 deletions

1
.fmf/version Normal file
View File

@ -0,0 +1 @@
1

3
.gitignore vendored
View File

@ -1 +1,2 @@
SOURCES/libisofs-1.4.8.tar.gz
/libisofs-*.tar.gz
/libisofs-*.tar.gz.sig

View File

@ -1 +0,0 @@
f487a6c9cb713fd7f0aab21860f219ac2267801f SOURCES/libisofs-1.4.8.tar.gz

View File

@ -0,0 +1,31 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
Comment: 44BC 9FD0 D688 EB00 7C4D D029 E9CB DFC0 ABC0 A854
xsDiBEuxz8kRBADMPu5I4LHXlih4Rd66cbPO1hkRir22yGbBkDVL1GAYy+T0RWzo
ILLdZm2n/Lgqhf+tBEWVft1Y2pkGRgG81cOItR+LDXVVWcR6KQudMBI7qeBrijBF
a09c9MJ2cJ2b/vkyxeqeOO012OKQ0jPc4l5OtKr+WwzOBaYBE5Q3+OkJkwCgwDy7
f79ruLDT1MkNixjPIyQpdmkD+waqPewvQ6VMwXeX30gHmileCNXuz5U1NVsuvJH4
5LtDokl9v/A/lD3Y6DEYD10Ye0hV0YLd140cfhRqvqt/JjfpzePYSUrwH7yW49T4
C8J4JgTNuF3KFop8Bq6XNiDbEXxSfjiXWJu51pLRSe4r7ux8AwsgopFdAU28Ccml
1puGA/4xWZrsauu0pVKK3Ox1/PPdyFqUXUV3Vm2yqc7+5stozI2cCrUXzZum+ju1
5WL4QqFvt354j2PBa4dSMOiqGSqDtn7Q+jI3dNp6KaN/3NFz87rLOBOS/F22tMiF
q4CX2vhy3b6AHe2SKMEMJBF3RIHLivuTZGqqctA8K5gYs6HDlM0iVGhvbWFzIFNj
aG1pdHQgPHNjZGJhY2t1cEBnbXgubmV0PsJ3BBMRAgAgBQJLsc/JAhsDBgsJCAcD
AgQVAggDBBYCAwECHgECF4AAIQkQ6cvfwKvAqFQWIQREvJ/Q1ojrAHxN0Cnpy9/A
q8CoVMnjAJ0XUrdWn95haLAm09NsVxQBFuH3tACfV44Wx4rQLPNzMKWoYcjJiLq0
3bPOwU0ES7HP0BAIAPJyFbTIM7iYmFI/tqz9+K05dbA0gAJTkHwR3FyJTll8Mar/
O+fOkOjDhTO8KxelWfjlGNEPtxQyolThok6rV778cthX8oQV333oWmGARfukh7sD
M/FhepJQ11jPCiHG9J+y6vXYphnbzWVLGgPR7oE106ugIeSJVBFYUT5mgnM1/uR5
VbqEbEWfX9uN5eC/oS3NFyuYgtfbTRZp6HPBEQ5qFM0pTsk2Ld/m4tZK032VN28u
o9kdWfDgnWTVoSVXE6LtmM5gEd4cvv3GB2rx8KA9FGnlEIfpQzIVc2gvu2n2+CNK
wZTDnrQoScCXNlWn5TuHtMbm054FdRR6iA6oNIcABREH/0baGwH9nXUSFG/JOLYY
YKlbR8c8CeTsjRmSGnsv0zd8QwTdNs88aU4z9KmrYPfyAGOMhhajsBc9k3Yi7K37
sTiy0sCmiJkxwTzMdWo6IgSR415ZyWdRBQUPLzIqX8rIBMp5iIbWa26e9swlBALW
zHSctBFWbjjysxjas7yfNcZA//FF30JxIMQI2Lrfi6yCX4CJbAM3TUQr19cETFDc
gEyPYz21hygNKW2ZUoYaXGpCFEIbH+anLi5UxcykS4ITkZECIE+m7j3C48/Bkciw
Lam6vlbSe2jVJlv2nIEeu0aVgplG04eKd3EQssEbPZygQJpv6eET/jaW7IXlSc/R
OJ7CYAQYEQIACQUCS7HP0AIbDAAhCRDpy9/Aq8CoVBYhBES8n9DWiOsAfE3QKenL
38CrwKhUGEgAnRU3scv4W3CVVWdhyiuK7K9SNh2vAKCSeJewZqZ1LPpblL2kIUXj
oQOV5w==
=7S1X
-----END PGP PUBLIC KEY BLOCK-----

Binary file not shown.

6
gating.yaml Normal file
View File

@ -0,0 +1,6 @@
--- !Policy
product_versions:
- rhel-10
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

View File

@ -0,0 +1,20 @@
Patch by Robert Scheck <robert@fedoraproject.org> for libisofs >= 1.5.4 to work around the Debian
specific aclocal/libtool behaviour not covering /usr/lib64 or /lib64 paths for 64 bit libraries.
--- libisofs-1.5.4/configure 2021-02-07 10:34:02.000000000 +0100
+++ libisofs-1.5.4/configure.rpath 2021-07-23 03:16:43.985026301 +0200
@@ -11474,10 +11474,13 @@
# before this can be enabled.
hardcode_into_libs=yes
+ # Add ABI-specific directories to the system library path.
+ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on

View File

@ -2,20 +2,21 @@
Summary: Library to create ISO 9660 disk images
Name: libisofs
Version: 1.4.8
Release: 3%{?dist}
# make_isohybrid_mbr.c is under LGPLv2+, the rest under GPLv2+
License: GPLv2+ and LGPLv2+
Group: System Environment/Libraries
URL: http://libburnia-project.org/
Source0: http://files.libburnia-project.org/releases/%{pkgname}-%{version}.tar.gz
Source1: http://files.libburnia-project.org/releases/%{pkgname}-%{version}.tar.gz.sig
Version: 1.5.6
Release: 6%{?dist}
# libisofs/make_isohybrid_mbr.c is LGPL-2.0-or-later, rest is GPL-2.0-or-later
License: GPL-2.0-or-later AND LGPL-2.0-or-later
URL: https://libburnia-project.org/
Source0: https://files.libburnia-project.org/releases/%{pkgname}-%{version}.tar.gz
Source1: https://files.libburnia-project.org/releases/%{pkgname}-%{version}.tar.gz.sig
Source2: https://keys.openpgp.org/vks/v1/by-fingerprint/44BC9FD0D688EB007C4DD029E9CBDFC0ABC0A854
Patch0: libisofs-0.6.16-multilib.patch
BuildRequires: libacl-devel, zlib-devel
%if 0%{?rhel} >= 6 && 0%{?rhel} <= 7
Patch1: libisofs-1.5.4-rpath.patch
BuildRequires: gnupg2
BuildRequires: gcc, make, libacl-devel, zlib-devel
%if 0%{?rhel} && "%{name}" != "%{pkgname}"
BuildRequires: autoconf, automake, libtool
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description
Libisofs is a library to create an ISO-9660 filesystem and supports
@ -28,32 +29,32 @@ zlib, it supports zisofs compression, too.
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}, pkgconfig
%description devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.
%if 0%{!?_without_doc:1}
%package doc
Summary: Documentation files for %{name}
Group: Documentation
%if 0%{?fedora} || 0%{?rhel} >= 6
BuildArch: noarch
%endif
BuildRequires: doxygen, graphviz
%description doc
Libisofs is a library to create an ISO-9660 filesystem and supports
extensions like RockRidge or Joliet. This package contains the API
documentation for developing applications that use %{name}.
%endif
%prep
%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
%setup -q -n %{pkgname}-%{version}
%patch0 -p1 -b .multilib
%patch1 -p1 -b .rpath
# Rename from libisofs to libisofs1 for RHEL >= 6
%if 0%{?rhel} >= 6 && 0%{?rhel} <= 7
# Rename from libisofs to libisofs1 for EPEL
%if 0%{?rhel} && "%{name}" != "%{pkgname}"
sed -e 's@libisofs_libisofs@libisofs_libisofs1@g' \
-e 's@libisofs/libisofs.la@libisofs/libisofs1.la@g' \
-e 's@(includedir)/libisofs@(includedir)/libisofs1@g' \
@ -62,17 +63,16 @@ sed -e 's@libisofs-1.pc@libisofs1-1.pc@g' -i configure.ac
sed -e 's@isofs@isofs1@g' libisofs-1.pc.in > libisofs1-1.pc.in
libtoolize --force
autoreconf --force
autoreconf --force --install
%endif
%build
%configure --disable-static
make %{?_smp_mflags}
doxygen doc/doxygen.conf
%make_build
%{!?_without_doc:doxygen doc/doxygen.conf}
%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' install
%make_install
# Don't install any libtool .la files
rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}.la
@ -80,15 +80,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}.la
# Clean up for later usage in documentation
rm -rf $RPM_BUILD_ROOT%{_defaultdocdir}
%clean
rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%ldconfig_scriptlets
%files
%{!?_licensedir:%global license %%doc}
%license COPYING
%doc AUTHORS COPYRIGHT README
%{_libdir}/%{name}*.so.*
@ -98,10 +92,70 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/%{name}.so
%{_libdir}/pkgconfig/%{name}*.pc
%if 0%{!?_without_doc:1}
%files doc
%doc doc/html/
%endif
%changelog
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.5.6-6
- Bump release for October 2024 mass rebuild:
Resolves: RHEL-64018
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.5.6-5
- Bump release for June 2024 mass rebuild
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.6-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.6-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.6-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Tue Jun 20 2023 Robert Scheck <robert@fedoraproject.org> 1.5.6-1
- Upgrade to 1.5.6 (#2216133)
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.4-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.4-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Mon Feb 08 2021 Robert Scheck <robert@fedoraproject.org> 1.5.4-1
- Upgrade to 1.5.4 (#1926007)
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Sun Oct 27 2019 Robert Scheck <robert@fedoraproject.org> 1.5.2-1
- Upgrade to 1.5.2 (#1765955)
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Sat Dec 08 2018 Robert Scheck <robert@fedoraproject.org> 1.5.0-1
- Upgrade to 1.5.0
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.8-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.8-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

16
plans/tier1.fmf Normal file
View File

@ -0,0 +1,16 @@
---
summary: Tier1 plan for libisofs
discover:
how: fmf
url: https://pkgs.devel.redhat.com/git/tests/libisofs
ref: master
filter: tier:1
execute:
how: tmt
adjust:
enabled: false
when: distro == centos-stream or distro == fedora

2
sources Normal file
View File

@ -0,0 +1,2 @@
SHA512 (libisofs-1.5.6.tar.gz) = a5f573bbe9758e072fad195cc9beb672568273ddb993ece9c15585ad3f99efb0deae6fefb6d3d40b9712e73e3bc68869d79d923b2a09623d190f5dc84974d65f
SHA512 (libisofs-1.5.6.tar.gz.sig) = e0a12a75cea99878e6908b0faaab9595c75fb345c36cdb1c42ee4aba6ac9ca01a282bc9cc37874b49072fc68de990345341ce72885c072920120fb1c7f9d52ba