From b84f1a0a2e272f42b2af35a9242319c1fe79ea79 Mon Sep 17 00:00:00 2001
From: Baptiste Grenier <baptiste.grenier@egi.eu>
Date: Fri, 28 Jun 2024 14:01:56 +0200
Subject: [PATCH] Add missing PERL dependencies for EL9 (#16)

* Add missing PERL dependencies for EL9.
* Prepare version 1.6.1

Fix #15.
---
 .github/workflows/build.yml   | 9 +++------
 .gitignore                    | 1 +
 CHANGELOG                     | 6 ++++++
 glite-info-provider-ldap.spec | 8 +++++++-
 4 files changed, 17 insertions(+), 7 deletions(-)
 create mode 100644 .gitignore

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a7adb7f..c2ae922 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -71,11 +71,7 @@ jobs:
           yum install -y epel-release
           yum localinstall -y glite-info-provider-ldap-*.el7.noarch.rpm
 
-  # FIXME: openldap-servers is in CentOS 8 Stream Powertools, but not in AlmaLinux PowerTools
-  # See https://bugs.almalinux.org/view.php?id=222
-  # Currently instaling using the package from devel repository
-  # See https://bugs.almalinux.org/view.php?id=100
-  # https://repo.almalinux.org/almalinux/8/devel/x86_64/os/Packages/
+  # XXX: From PowerTools: openldap-servers
   install-almalinux8:
     name: Install AlmaLinux 8 RPMs
     needs: build-almalinux
@@ -87,7 +83,8 @@ jobs:
           name: rpms8
       - name: Install generated RPMs
         run: |
-          yum install -y https://repo.almalinux.org/almalinux/8/devel/x86_64/os/Packages/openldap-servers-2.4.46-18.el8.x86_64.rpm
+          yum install -y dnf-plugins-core
+          dnf config-manager --set-enabled powertools
           yum localinstall -y glite-info-provider-ldap-*.el8.noarch.rpm
 
   # XXX Dependencies from EPEL: openldap-servers
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..567609b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+build/
diff --git a/CHANGELOG b/CHANGELOG
index ffa54cf..a598b1e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -8,6 +8,12 @@ and this project adheres to
 
 ## [Unreleased]
 
+## [1.6.1] - 2024-06-28
+
+### Added
+
+- Add missing perl dependencies for EL9. (#16) (Baptiste Grenier)
+
 ## [1.6.0] - 2023-04-04
 
 ### Changed
diff --git a/glite-info-provider-ldap.spec b/glite-info-provider-ldap.spec
index 1457ee6..8ce5e56 100644
--- a/glite-info-provider-ldap.spec
+++ b/glite-info-provider-ldap.spec
@@ -1,5 +1,5 @@
 Name:          glite-info-provider-ldap
-Version:       1.6.0
+Version:       1.6.1
 Release:       1%{?dist}
 Summary:       LDAP information provider
 Group:         Development/Libraries
@@ -11,6 +11,10 @@ BuildRoot:     %{_tmppath}/%{name}-%{version}-build
 BuildRequires: rsync
 BuildRequires: make
 Requires:      openldap-servers
+%if 0%{?rhel} >= 9
+Requires: perl-File-Copy
+Requires: perl-libwww-perl
+%endif
 
 %description
 Information provider to query LDAP sources and return the result.
@@ -40,6 +44,8 @@ rm -rf %{buildroot}
 %license /usr/share/licenses/%{name}-%{version}/LICENSE.txt
 
 %changelog
+* Tue Apr 28 2024 Baptiste Grenier <baptiste.grenier@egi.eu> - 1.6.1-1
+- Add missing perl dependencies for EL9. (#16) (Baptiste Grenier)
 
 * Tue Apr 4 2023 Baptiste Grenier <baptiste.grenier@egi.eu> - 1.6.0-1
 - Build and release using CentOS 7, AlmaLinux 8 and 9. (#12) (Baptiste Grenier)