From 860e1f46e106d8d8273ba003cf198015730220cb Mon Sep 17 00:00:00 2001
From: andrea manzi <andrea.manzi@gmail.com>
Date: Thu, 6 Jun 2024 20:21:39 +0000
Subject: [PATCH 1/2] added trust-anchors repo

---
 CHANGELOG             |  3 +++
 Makefile              |  2 ++
 egi-trustanchors.repo |  6 ++++++
 ui.spec               | 11 +++++++++--
 4 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 egi-trustanchors.repo

diff --git a/CHANGELOG b/CHANGELOG
index bf13fb5..9d3fd05 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -8,6 +8,9 @@ and this project adheres to
 
 ## [Unreleased]
 
+## [6.0.1]
+- Included EGI Trustanchor repo (Andrea Manzi)
+
 ## [6.0.0]
 - Added support for el9 (#6) (Andrea Manzi)
  
diff --git a/Makefile b/Makefile
index 52a49d7..4d7bcb3 100755
--- a/Makefile
+++ b/Makefile
@@ -20,6 +20,7 @@ dist:
 
 sources: dist
 	cp $(build)/$(NAME)-$(VERSION).tar.gz .
+	cp $(build)/*.repo .
 
 prepare: dist
 	@mkdir -p  $(build)/RPMS/noarch
@@ -29,6 +30,7 @@ prepare: dist
 	@mkdir -p  $(build)/BUILD/
 	cp $(build)/$(NAME)-$(VERSION).tar.gz $(build)/SOURCES
 	cp $(NAME).spec $(build)/SPECS
+	cp *.repo $(build)/SOURCES
 
 srpm: prepare
 	rpmbuild -bs --define="dist ${dist}" --define='_topdir ${build}' $(build)/SPECS/$(NAME).spec
diff --git a/egi-trustanchors.repo b/egi-trustanchors.repo
new file mode 100644
index 0000000..170b763
--- /dev/null
+++ b/egi-trustanchors.repo
@@ -0,0 +1,6 @@
+[EGI-trustanchors]
+name=EGI-trustanchors
+baseurl=http://repository.egi.eu/sw/production/cas/1/current/
+gpgkey=http://repository.egi.eu/sw/production/cas/1/GPG-KEY-EUGridPMA-RPM-3
+gpgcheck=1
+enabled=1
diff --git a/ui.spec b/ui.spec
index 43d7c1f..5b4fe87 100644
--- a/ui.spec
+++ b/ui.spec
@@ -1,13 +1,14 @@
 %global debug_package %{nil}
 
 Name: ui
-Version: 6.0.0
+Version: 6.0.1
 Release: 1%{?dist}
 Summary: User Interface meta-package
 Group: Applications/Internet
 License: ASL 2.0
 URL: https://github.com/EGI-Federation/ui-metapackage
-Source: %{name}-%{version}.tar.gz
+Source0: %{name}-%{version}.tar.gz
+Source1: egi-trustanchors.repo
 BuildRoot: %{_tmppath}/%{name}-%{version}-build
 
 # the above replaced by ca-policy-egi-core
@@ -71,6 +72,9 @@ can use to access grid services
 %install
 rm -rf %{buildroot}
 make install prefix=%{buildroot}
+install -dm 755 %{buildroot}%{_sysconfdir}/yum.repos.d
+install -pm 644 %{SOURCE1}   \
+	%{buildroot}%{_sysconfdir}/yum.repos.d
 
 %clean
 rm -rf %{buildroot}
@@ -78,8 +82,11 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc /usr/share/doc/ui/README.md
+%config(noreplace) /etc/yum.repos.d/egi-trustanchors.repo
 
 %changelog
+* Thu Jun 06 2024 <andrea.manzi@egi.eu> - 6.0.1-1
+- Included egi-trustanchors.repo
 * Tue Jun 04 2024 <andrea.manzi@egi.eu> - 6.0.0-1
 - Support for El9 (#6) (Andrea Manzi)
 * Fri Nov 18 2022 Baptiste Grenier <baptiste.grenier@egi.eu> - 5.0.0-1

From 47d745cea23fde63a5f1221f480f7798f35effdb Mon Sep 17 00:00:00 2001
From: andrea manzi <andrea.manzi@gmail.com>
Date: Thu, 6 Jun 2024 20:25:08 +0000
Subject: [PATCH 2/2] update build job

---
 .github/workflows/build.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6ab4dc9..2872614 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -78,6 +78,5 @@ jobs:
           # FIXME: remove external repo when UMD5 is available 
           dnf install -y epel-release
           dnf install -y https://research.cs.wisc.edu/htcondor/repo/23.x/htcondor-release-current.el9.noarch.rpm
-          dnf config-manager --add-repo  http://repository.egi.eu/sw/production/cas/1/current/repo-files/egi-trustanchors.repo
           dnf config-manager --set-enabled crb
           dnf localinstall -y ui-*.rpm