From 17fef5b62b5b0bbcd7d63963f2499e68573edb64 Mon Sep 17 00:00:00 2001 From: YellowJacketLinux Date: Wed, 10 May 2023 13:49:50 -0700 Subject: [PATCH] fix packaging mistakes --- SPECS/cracklib.spec | 15 ++++++++------- SPECS/python3.spec | 22 +++++++++++----------- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/SPECS/cracklib.spec b/SPECS/cracklib.spec index b058860..c5406a3 100644 --- a/SPECS/cracklib.spec +++ b/SPECS/cracklib.spec @@ -1,6 +1,6 @@ Name: cracklib Version: 2.9.8 -Release: %{?repo}0.rc5%{?dist} +Release: %{?repo}0.rc6%{?dist} Summary: A library to somewhat prevent easily crackable passwords Group: System Environment/Libraries @@ -53,11 +53,9 @@ links against the libcrack library. Summary: Python bindings for cracklib Group: Python/Libraries Requires: %{name} = %{version}-%{release} -%if %{?python3_ABI:1}%{!?python3_ABI:0} +%if 0%{?python3_ABI:1} == 1 # Non-Standard Macro Requires: %{python3_ABI} -%else -Requires: %{python3_sitearch} %endif %description -n python3-cracklib @@ -151,12 +149,15 @@ fi %files -n python3-cracklib %defattr(-,root,root,-) -%{python3_sitelib}/*.py -%{python3_sitearch}/_cracklib.so -%{python3_sitearch}/__pycache__/*.pyc +%attr(0644,root,root) %{python3_sitelib}/*.py +%attr(0755,root,root) %{python3_sitearch}/_cracklib.so +%attr(0644,root,root) %{python3_sitearch}/__pycache__/*.pyc %changelog +* Sun Apr 16 2023 Michael A. Peters - 2.9.8-0.rc6 +- fix python perms + * Sun Apr 16 2023 Michael A. Peters - 2.9.8-0.rc5 - Tabs to spaces, rebuild in newly packaged gcc, utilities -> utils diff --git a/SPECS/python3.spec b/SPECS/python3.spec index 5f1d3ee..d3b8174 100644 --- a/SPECS/python3.spec +++ b/SPECS/python3.spec @@ -1,4 +1,4 @@ -%define specrel 0.rc2 +%global specrel 0.rc2 %if 0%{?!__sed:1} == 1 %global __sed %{_bindir}/sed @@ -8,18 +8,18 @@ %endif # Version definitions -%define python3_version 3.11 -%define python3_nodots 311 +%global python3_version 3.11 +%global python3_nodots 311 # General macros -%define __python3 /usr/bin/python3 -%define python3 %__python3 -%define python3_sitelib /usr/lib/python%{python3_version}/site-packages -%define python3_sitearch /usr/lib/python%{python3_version}/site-packages -%define python3_platform linux-%{_arch} +%global __python3 /usr/bin/python3 +%global python3 %__python3 +%global python3_sitelib /usr/lib/python%{python3_version}/site-packages +%global python3_sitearch /usr/lib/python%{python3_version}/site-packages +%global python3_platform linux-%{_arch} # YJL specific macros -%define python3_os_platform %{_arch}-linux-gnu -%define python3_API Python-%{python3_version} -%define python3_ABI %{python3_API}-%{python3_os_platform} +%global python3_os_platform %{_arch}-linux-gnu +%global python3_API Python-%{python3_version} +%global python3_ABI %{python3_API}-%{python3_os_platform} # Name: python3