From cfd0da16599dad46cf3ed46e3702f6b3402021cf Mon Sep 17 00:00:00 2001 From: Christof Schulze Date: Fri, 13 Dec 2019 13:24:34 +0100 Subject: [PATCH] cleaning old repository configuration --- .target | 18 +++++++++++++----- README | 6 +++--- ww8-el-release.spec | 18 +++++++++++++----- ww8-el.repo | 2 ++ 4 files changed, 31 insertions(+), 13 deletions(-) diff --git a/.target b/.target index 6b3c279..13ead17 100644 --- a/.target +++ b/.target @@ -1,5 +1,13 @@ -- - - release: epel-7-x86_64 - repo: - - release: epel-8-x86_64 - repo: \ No newline at end of file +--- # ppbuilder target definition v1 + +- release: "epel-7-x86_64" + objects: + - ww8-el-release + rpms: release/centos7/x86_64 + spms: release/centos7/SRPMS + +- release: "epel-8-x86_64" + objects: + - "ww8-el-release" + rpms: "release/centos8/x86_64" + spms: "release/centos8/SRPMS" diff --git a/README b/README index c266ca3..fa223b2 100644 --- a/README +++ b/README @@ -1,11 +1,11 @@ -ww8-el7-release +ww8-el-release --------------- -Repository release package +Repository release package for Enterprise Linux (RHEL/Centos 6/7/8) # On Buildserver (mock) call: ```bash -mock -r epel-7-x86_64 --scm-enable --scm-option method=git --scm-option package=ww8-el7-release --scm-option git_get=set --scm-option spec=ww8-el7-release.spec --scm-option git_get='git clone /home/cschulze/Projects/ww8it-repos/packages/ww8-el7-release/' +mock -r epel-7-x86_64 --scm-enable --scm-option method=git --scm-option package=ww8-el-release --scm-option git_get=set --scm-option spec=ww8-el-release.spec --scm-option git_get='git clone https://simlab.ww.uni-erlangen.de/ww8it/packaging/ww8-el-release.git' ``` diff --git a/ww8-el-release.spec b/ww8-el-release.spec index 5474258..8b2dc22 100644 --- a/ww8-el-release.spec +++ b/ww8-el-release.spec @@ -10,15 +10,15 @@ Name: ww8-release %if %{rhel} == 8 Version: 8.0 -Release: 2%{?dist} +Release: 3%{?dist} %endif %if %{rhel} == 7 Version: 7.6 -Release: 3%{?dist} +Release: 4%{?dist} %endif %if %{rhel} == 6 Version: 6.9 -Release: 3%{?dist} +Release: 4%{?dist} %endif Summary: Configuration for ww8 repository @@ -26,7 +26,7 @@ Summary: Configuration for ww8 repository Group: System Environment/Base License: GPL URL: https://infra.ww8kd.fau.de/packages/ -Source0: ww8-el.repo +Source0: ww8-el.repo #Source1: RPM-GPG-KEY-ww8 @@ -57,16 +57,24 @@ echo empty build rm -rf $RPM_BUILD_ROOT %{__install} -Dp -m0644 %{SOURCE0} %{buildroot}%{_sysconfdir}/yum.repos.d/ww8-el.repo #%{__install} -Dp -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-ww8 +# will be removed on update ww8-el7.repo +rm -f %{_sysconfdir}/yum.repos.d/rpm-ww8.repo %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%config %{_sysconfdir}/yum.repos.d/ww8-el7.repo +%config %{_sysconfdir}/yum.repos.d/ww8-el.repo #%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-ww8 %changelog +* Fri Dec 13 2019 Christof Schulze - 8.0-3 +- cleaning old repository configuration + +* Thu Dec 12 2019 Christof Schulze - 8.0-2 +- Update ww8-el-release.spec, fixing installation + * Thu Dec 12 2019 Christof Schulze - 8.0-1 - first release of repository confguration diff --git a/ww8-el.repo b/ww8-el.repo index 36ab3d6..200d9d3 100644 --- a/ww8-el.repo +++ b/ww8-el.repo @@ -7,6 +7,8 @@ enabled=1 metadata_expire=1h skip_if_unavailable=True gpgcheck=0 +cost=100 + [ww8-sources] name=WW8 SRPM repository - Centos $releasever - SRPM -- GitLab