From 1e001d1a8e45a88b69be2af4e1657f0d447960e2 Mon Sep 17 00:00:00 2001 From: Chris Darroch Date: Wed, 18 Oct 2023 14:05:04 -0700 Subject: [PATCH] rpm: remove unused repo package build sources Since commit git-lfs/build-dockers@d4c2fe6f797decb6862072f0dc266d92b300e51a the centos_script.bsh script in that repository has not built the "repository configuration" or "repo" RPM packages, which were intended, it seems, to contain extra packages and GPG signatures for Git LFS. We can therefore remove the stale RPM spec and source files which pertained only to this extra RPM build, and also some lines in the rpm/build_rpms.bsh which created an empty stub GPG key file for this build. --- rpm/SOURCES/git-lfs.repo | 13 -------- rpm/SPECS/git-lfs-repo-release.spec | 47 ----------------------------- rpm/build_rpms.bsh | 4 --- 3 files changed, 64 deletions(-) delete mode 100644 rpm/SOURCES/git-lfs.repo delete mode 100644 rpm/SPECS/git-lfs-repo-release.spec diff --git a/rpm/SOURCES/git-lfs.repo b/rpm/SOURCES/git-lfs.repo deleted file mode 100644 index 50679fc5..00000000 --- a/rpm/SOURCES/git-lfs.repo +++ /dev/null @@ -1,13 +0,0 @@ -[git-lfs] -name=Packages for git-lfs for Enterprise Linux $releasever - $basearch -baseurl=http://git-lfs.github.com/centos/$releasever/RPMS -enabled=1 -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-GITLFS - -[git-lfs-source] -name=Packages for git-lfs for Enterprise Linux $releasever - $basearch -baseurl=http://git-lfs.github.com/centos/$releasever/SRPMS -enabled=0 -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-GITLFS diff --git a/rpm/SPECS/git-lfs-repo-release.spec b/rpm/SPECS/git-lfs-repo-release.spec deleted file mode 100644 index 232ae566..00000000 --- a/rpm/SPECS/git-lfs-repo-release.spec +++ /dev/null @@ -1,47 +0,0 @@ -Name: git-lfs-repo-release -Version: 1 -Release: 1%{?dist} -Summary: Packages for git-lfs for Enterprise Linux repository configuration - -Group: System Environment/Base -License: MIT -%if 0%{?fedora} -URL: https://git-lfs.github.com/fedora/%{fedora}/ -%elseif 0%{?rhel} -URL: https://git-lfs.github.com/centos/%{rhel}/ -%endif -Source0: RPM-GPG-KEY-GITLFS -Source1: git-lfs.repo -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildArch: noarch - -%description -This package contains the Extra Packages for Enterprise Linux (EPEL) repository -GPG key as well as configuration for yum. - -%prep -%setup -q -c -T - -%build - - -%install -[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT - -#GPG Key -install -Dpm 644 %{SOURCE0} \ - $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-GITLFS - -# yum -install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d -install -pm 644 %{SOURCE1} \ - $RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d - -%clean -[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT - -%files -%defattr(-,root,root,-) -%config(noreplace) /etc/yum.repos.d/* -/etc/pki/rpm-gpg/* diff --git a/rpm/build_rpms.bsh b/rpm/build_rpms.bsh index 88f03e62..8c2b07cf 100755 --- a/rpm/build_rpms.bsh +++ b/rpm/build_rpms.bsh @@ -82,10 +82,6 @@ popd echo "Cleaning ${CURDIR}/tmptar again" rm -rf ${CURDIR}/tmptar -#TODO TASK 2 -#cp ${CURDIR}/../docker/public.key ${CURDIR}/SOURCES/RPM-GPG-KEY-GITLFS -touch ${CURDIR}/SOURCES/RPM-GPG-KEY-GITLFS - echo "Build git-lfs RPMs..." #--no-deps added for now so you can compile without official rpms installed