From 0d01404634821c72fdc4fde3ff521b79267e204e Mon Sep 17 00:00:00 2001 From: "Michael A. Peters" Date: Sun, 21 May 2023 04:50:52 -0700 Subject: [PATCH] cleanup work --- SPECS/nghttp2.spec | 12 +++++++++--- SPECS/ninja.spec | 10 +++------- SPECS/nss.spec | 2 +- SPECS/openssh.spec | 2 +- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/SPECS/nghttp2.spec b/SPECS/nghttp2.spec index 0f52f41..031f54a 100644 --- a/SPECS/nghttp2.spec +++ b/SPECS/nghttp2.spec @@ -1,3 +1,5 @@ +# needs work for 1.cli. repo + Name: nghttp2 Version: 1.52.0 Release: %{?repo}0.rc1%{?dist} @@ -6,9 +8,10 @@ Summary: HTTP/2 C Library Group: System Environment/Libraries License: MIT URL: https://nghttp2.org/ -Source0: https://github.com/nghttp2/nghttp2/releases/download/v1.52.0/nghttp2-%{version}.tar.xz +Source0: https://github.com/nghttp2/nghttp2/releases/download/v%{version}/nghttp2-%{version}.tar.xz #BuildRequires: libxml2-devel +BuildRequires: python3-devel #Requires: %description @@ -33,9 +36,12 @@ against the %{name} library. %build +PYTHON=%{python3} \ %configure \ - --disable-static \ - --enable-lib-only + --with-libxml2 \ + --disable-static +# \ +# --enable-lib-only make %{?_smp_mflags} diff --git a/SPECS/ninja.spec b/SPECS/ninja.spec index ac983cc..d88589d 100644 --- a/SPECS/ninja.spec +++ b/SPECS/ninja.spec @@ -1,7 +1,3 @@ -%if 0%{?!__install:1} -%global __install %{_bindir}/install -%endif - Name: ninja Version: 1.11.1 Release: %{?repo}0.rc1%{?dist} @@ -44,9 +40,9 @@ sed -i '/int Guess/a \ %install -%{__install} -Dm755 ninja %{buildroot}%{_bindir}/ninja -%{__install} -Dm644 misc/bash-completion %{buildroot}%{_datadir}/bash-completion/completions/ninja -%{__install} -Dm644 misc/zsh-completion %{buildroot}%{_datadir}/zsh/site-functions/_ninja +install -Dm755 ninja %{buildroot}%{_bindir}/ninja +install -Dm644 misc/bash-completion %{buildroot}%{_datadir}/bash-completion/completions/ninja +install -Dm644 misc/zsh-completion %{buildroot}%{_datadir}/zsh/site-functions/_ninja %files diff --git a/SPECS/nss.spec b/SPECS/nss.spec index 0d21b42..1234395 100644 --- a/SPECS/nss.spec +++ b/SPECS/nss.spec @@ -12,7 +12,7 @@ Summary: security-enabled client and server libraries Group: System Environment/Libraries License: MPL-2.0 URL: https://firefox-source-docs.mozilla.org/security/nss/index.html -Source0: https://archive.mozilla.org/pub/security/nss/releases/NSS_%{sdirv}_RTM/src/nss-3.88.1.tar.gz +Source0: https://archive.mozilla.org/pub/security/nss/releases/NSS_%{sdirv}_RTM/src/nss-%{version}.tar.gz #Patch0: https://www.linuxfromscratch.org/patches/blfs/11.3/nss-3.88.1-standalone-1.patch Patch0: nss-3.88.1-standalone-rpm.patch diff --git a/SPECS/openssh.spec b/SPECS/openssh.spec index e5f6b8c..f076dc5 100644 --- a/SPECS/openssh.spec +++ b/SPECS/openssh.spec @@ -28,7 +28,7 @@ Summary: Secure Shell Group: System Environment/Utilities License: BSD-2-Clause, BSD-3-Clause, ISC-style, and MIT-style URL: https://www.openssh.com/ -Source0: https://ftp.usa.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-9.3p1.tar.gz +Source0: https://ftp.usa.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz %if 0%{?libresslAPI:1} == 1 BuildRequires: libressl-devel