Compare commits

...

No commits in common. 'cs10' and 'c9' have entirely different histories.
cs10 ... c9

2
.gitignore vendored

@ -1 +1 @@
SOURCES/targetcli-fb-2.1.58.tar.gz SOURCES/targetcli-fb-2.1.53.tar.gz

@ -1 +1 @@
b1f58ea4ba7c329faa9aa4aca8c2e4da21ce5e08 SOURCES/targetcli-fb-2.1.58.tar.gz cb06b7dc70606e63974df107d418c2344dcc7d7b SOURCES/targetcli-fb-2.1.53.tar.gz

@ -0,0 +1,26 @@
From 88da522778fc6a7b256cda7f960912b439290538 Mon Sep 17 00:00:00 2001
From: Matt Coleman <matt@datto.com>
Date: Fri, 19 Jun 2020 19:06:24 -0400
Subject: [PATCH] Do not install systemd files in setup.py
setuptools should not perform OS-specific actions such as installing systemd units.
OS-specific actions should be handled by the package manager.
---
setup.py | 1 -
1 file changed, 1 deletion(-)
diff --git a/setup.py b/setup.py
index 4518165..8dff55e 100755
--- a/setup.py
+++ b/setup.py
@@ -34,7 +34,6 @@ setup(
'scripts/targetcli',
'daemon/targetclid'
],
- data_files = [('/lib/systemd/system', ['systemd/targetclid.socket', 'systemd/targetclid.service'])],
classifiers = [
"Programming Language :: Python",
"Programming Language :: Python :: 3",
--
2.27.0

@ -3,12 +3,13 @@
Name: targetcli Name: targetcli
License: ASL 2.0 License: ASL 2.0
Summary: An administration shell for storage targets Summary: An administration shell for storage targets
Version: 2.1.58 Version: 2.1.53
Release: 3%{?dist} Release: 7%{?dist}
URL: https://github.com/open-iscsi/%{oname} URL: https://github.com/open-iscsi/%{oname}
Source: %{url}/archive/v%{version}/%{oname}-%{version}.tar.gz Source: %{url}/archive/v%{version}/%{oname}-%{version}.tar.gz
# Proposed upstream # Proposed upstream
## From: https://github.com/open-iscsi/targetcli-fb/pull/176 ## From: https://github.com/open-iscsi/targetcli-fb/pull/176
Patch1: Do-not-install-systemd-files-in-setup.py.patch
BuildArch: noarch BuildArch: noarch
BuildRequires: python3-devel, python3-setuptools, systemd-rpm-macros BuildRequires: python3-devel, python3-setuptools, systemd-rpm-macros
Requires: python3-rtslib, target-restore, python3-configshell, python3-six, python3-dbus Requires: python3-rtslib, target-restore, python3-configshell, python3-six, python3-dbus
@ -23,6 +24,7 @@ users will also need to install and use fcoe-utils.
%prep %prep
%setup -q -n %{oname}-%{version} %setup -q -n %{oname}-%{version}
%patch1 -p1
%build %build
%py3_build %py3_build
@ -47,53 +49,15 @@ install -m 644 systemd/* %{buildroot}%{_unitdir}/
%dir %{_sysconfdir}/target/backup %dir %{_sysconfdir}/target/backup
%changelog %changelog
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 2.1.58-3 * Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 2.1.53-7
- Bump release for October 2024 mass rebuild: - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Resolves: RHEL-64018 Related: rhbz#1991688
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2.1.58-2 * Thu Jun 24 2021 Maurizio Lombardi <mlombard@redhat.com> - 2.1.53-5
- Bump release for June 2024 mass rebuild - Add the gating.yaml file
* Mon Feb 12 2024 Maurizio Lombardi <mlombard@redhat.com> - 2.1.58-1 * Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.1.53-4
- Update to version v2.1.58 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.57-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Thu Oct 26 2023 Maurizio Lombardi <mlombard@redhat.com> - 2.1.57-1
- Update to version v2.1.57
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.56-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Tue Jun 13 2023 Python Maint <python-maint@redhat.com> - 2.1.56-2
- Rebuilt for Python 3.12
* Tue Jun 06 2023 Maurizio Lombardi <mlombard@redhat.com> - 2.1.56-1
- Rebase to version 2.1.56
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.54-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.54-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 2.1.54-5
- Rebuilt for Python 3.11
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.54-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.54-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 2.1.54-2
- Rebuilt for Python 3.10
* Mon May 17 2021 Maurizio Lombardi <mlombard@redhat.com> - 2.1.54-1
- Update to version 2.1.54
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.53-3 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.53-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

Loading…
Cancel
Save