diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000000000000000000000000000000000..db4e346bdd75728a22a96d80e9ad44a8d6e95bd1 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +*.gz filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text diff --git a/.lfsconfig b/.lfsconfig new file mode 100644 index 0000000000000000000000000000000000000000..3fa1357bc0e716cc7219a26415f9850711ef2484 --- /dev/null +++ b/.lfsconfig @@ -0,0 +1,2 @@ +[lfs] + url = https://artlfs.openeuler.openatom.cn/src-openEuler/python-bcrypt diff --git a/bcrypt-4.2.0.tar.gz b/bcrypt-4.2.0.tar.gz index 31f6de1424a8317cc1afbd6bf6c878ec4b5574dc..4c7a91e3c8a5733e7d95b692de8ac8d1019dda9e 100644 Binary files a/bcrypt-4.2.0.tar.gz and b/bcrypt-4.2.0.tar.gz differ diff --git a/python-bcrypt.spec b/python-bcrypt.spec index ef5010274548684e31e2d9d03f9095b53bafbf06..c7b1b3bebdb05f0e828624527c306eea4e6c17d6 100644 --- a/python-bcrypt.spec +++ b/python-bcrypt.spec @@ -1,8 +1,6 @@ -%global debug_package %{nil} - Name: python-bcrypt Version: 4.2.0 -Release: 3 +Release: 4 Summary: Modern password hashing for your software and your servers License: Apache-2.0 URL: https://github.com/pyca/bcrypt/ @@ -11,60 +9,55 @@ Source1: vendor.tar.gz Source2: config.toml %description Good password hashing for your software and your servers. -This library should be compatible with py-bcrypt and it will run on Python 2.7, 3.4+, and PyPy 2.6+. +This library should be compatible with py-bcrypt and it will run on Python 3.7+. %package -n python3-bcrypt Summary: Modern password hashing for your software and your servers -Provides: python-bcrypt - -BuildRequires: python3-devel -BuildRequires: python3-setuptools-rust -BuildRequires: rust cargo +Provides: python-bcrypt = %{version}-%{release} + +BuildRequires: python3-devel >= 3.7 +BuildRequires: python3-setuptools >= 42.0 +BuildRequires: python3-setuptools-rust >= 1.7.0 +BuildRequires: rust >= 1.64.0 +BuildRequires: cargo +BuildRequires: rust-packaging BuildRequires: python3-cffi BuildRequires: gcc -BuildRequires: python3-pytest +BuildRequires: python3-pytest >= 3.2.1 BuildRequires: python3-pip BuildRequires: python3-wheel -%description -n python3-bcrypt -Good password hashing for your software and your servers. -This library should be compatible with py-bcrypt and it will run on Python 2.7, 3.4+, and PyPy 2.6+. +Obsoletes: %{name}-help < %{version}-%{release} -%package help -Summary: Modern password hashing for your software and your servers -Buildarch: noarch -Provides: python3-bcrypt-doc -%description help +%description -n python3-bcrypt Good password hashing for your software and your servers. -This library should be compatible with py-bcrypt and it will run on Python 2.7, 3.4+, and PyPy 2.6+. +This library should be compatible with py-bcrypt and it will run on Python 3.7+. %prep -%autosetup -n bcrypt-%{version} -p1 -tar zxvf %{SOURCE1} +%autosetup -n bcrypt-%{version} -p1 -a1 mkdir .cargo cp %{SOURCE2} .cargo/ - %build +%set_build_flags %pyproject_build %install +%set_build_flags %pyproject_install -install -d -m755 %{buildroot}/%{_pkgdocdir} -if [ -d doc ]; then cp -arf doc %{buildroot}/%{_pkgdocdir}; fi -if [ -d docs ]; then cp -arf docs %{buildroot}/%{_pkgdocdir}; fi -if [ -d example ]; then cp -arf example %{buildroot}/%{_pkgdocdir}; fi %check export PYTHONPATH=%{buildroot}%{python3_sitearch} pytest %files -n python3-bcrypt +%doc README.rst %{python3_sitearch}/* -%files help -%{_docdir}/* - %changelog +* Sat Aug 09 2025 Funda Wang - 4.2.0-4 +- correctly build extension with updated rust flags +- drop empty help sub package + * Sun Aug 03 2025 Funda Wang - 4.2.0-3 - drop unused buildrequires diff --git a/vendor.tar.gz b/vendor.tar.gz index e1742694984bd6bfb2b03e77aca38242d7e91d47..8bc29eb443043dd0a57654af990880d8360b87c4 100644 Binary files a/vendor.tar.gz and b/vendor.tar.gz differ