public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/s3cmd] epel10: Adopt pyproject-rpm-macros and drop EL7 and python2
@ 2026-08-03 10:55 Frank Crawford
  0 siblings, 0 replies; only message in thread
From: Frank Crawford @ 2026-08-03 10:55 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/s3cmd
Branch : epel10
Commit : da0edb6a5cb463e3f2071cea5ad34a21651546ca
Author : Frank Crawford <frank@crawford.emu.id.au>
Date   : 2026-08-03T20:28:25+10:00
Stats  : +44/-45 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/s3cmd/c/da0edb6a5cb463e3f2071cea5ad34a21651546ca?branch=epel10

Log:
Adopt pyproject-rpm-macros and drop EL7 and python2

---
diff --git a/s3cmd.spec b/s3cmd.spec
index 4b6b4ea..5d72450 100644
--- a/s3cmd.spec
+++ b/s3cmd.spec
@@ -1,42 +1,20 @@
-%if 0%{?rhel} && 0%{?rhel} <= 7
-%bcond_with python3
-%else
-%bcond_without python3
-%endif
-
-%define	name	s3cmd
-%define	version	2.4.0
-%define	release	7
-
-Name:           %{name}
-Version:        %{version}
-Release:        %{release}%{?dist}
+Name:           s3cmd
+Version:        2.4.0
+Release:        14%{?dist}
 Summary:        Tool for accessing Amazon Simple Storage Service
 
 License:        GPL-2.0-or-later
-URL:            https://s3tools.org/%{name}
+URL:            https://s3tools.org/s3cmd
 Source0:        https://github.com/s3tools/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz
 BuildArch:      noarch
 
-%if %{with python3}
 BuildRequires:  python3-devel
-BuildRequires:  python3-setuptools
+
 Requires:       python3-dateutil
-Requires:       ( python3-magic or python3-file-magic )
+Requires:       (python3-magic or python3-file-magic)
 
-# Disable auto dependencies as sources match Python2
+# Disable auto dependencies as sources has a selection
 %{?python_disable_dependency_generator}
-%else
-BuildRequires:  python2-devel
-BuildRequires:  python2-setuptools
-%if 0%{?rhel} && 0%{?rhel} <= 7
-Requires:       python-dateutil
-Requires:       python-magic
-%else
-Requires:       python2-dateutil
-Requires:       python2-magic
-%endif
-%endif
 
 %description
 S3cmd lets you copy files from/to Amazon S3
@@ -44,46 +22,67 @@ S3cmd lets you copy files from/to Amazon S3
 command line client.
 
 %prep
-%setup -q
-rm -rf *.egg-info
-%if %{without python3}
-# Not needed on Py2, RPM fails to Bytecompile it
-rm -f S3/Custom_httplib3x.py
+%autosetup
+
+%if ! 0%{?rhel} || 0%{?rhel} >= 9
+%generate_buildrequires
+%pyproject_buildrequires -R
 %endif
 
 %build
 export S3CMD_PACKAGING=1
-%if %{with python3}
+%if 0%{?rhel} && 0%{?rhel} <= 8
 %py3_build
 %else
-%py2_build
+%pyproject_wheel
 %endif
 
 %install
+%if 0%{?rhel} && 0%{?rhel} <= 8
 export S3CMD_PACKAGING=1
-%if %{with python3}
 %py3_install
 %else
-%py2_install
+%pyproject_install
+%pyproject_save_files S3
 %endif
 
 mkdir -p %{buildroot}%{_mandir}/man1
 install -D -p -m 0644 -t %{buildroot}%{_mandir}/man1 %{name}.1
 
+%if 0%{?rhel} && 0%{?rhel} <= 8
 %files
-%license LICENSE
-%doc NEWS README.md
-%{_bindir}/%{name}
-%{_mandir}/man1/%{name}.1*
-%if %{with python3}
 %{python3_sitelib}/%{name}-*.egg-info/
 %{python3_sitelib}/S3/
 %else
-%{python2_sitelib}/%{name}-*.egg-info/
-%{python2_sitelib}/S3/
+%files -f %{pyproject_files}
 %endif
+%license LICENSE
+%doc NEWS README.md
+%{_bindir}/%{name}
+%{_mandir}/man1/%{name}.1*
 
 %changelog
+* Mon Aug 03 2026 Frank Crawford <frank@crawford.emu.id.au> - 2.4.0-14
+- Adopt pyproject-rpm-macros and drop EL7 and python2
+
+* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.0-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
+
+* Wed Jun 03 2026 Python Maint <python-maint@redhat.com> - 2.4.0-12
+- Rebuilt for Python 3.15
+
+* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.0-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
+* Fri Sep 19 2025 Python Maint <python-maint@redhat.com> - 2.4.0-10
+- Rebuilt for Python 3.14.0rc3 bytecode
+
+* Fri Aug 15 2025 Python Maint <python-maint@redhat.com> - 2.4.0-9
+- Rebuilt for Python 3.14.0rc2 bytecode
+
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.0-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
 * Fri Jun 27 2025 Frank Crawford <frank@crawford.emu.id.au> - 2.4.0-7
 - Fix for python3-magic/python3-file-magic requirement issue (BZ2375030)
 

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-08-03 10:55 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-08-03 10:55 [rpms/s3cmd] epel10: Adopt pyproject-rpm-macros and drop EL7 and python2 Frank Crawford

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox