From 0472874a8c4f299d934d6fa913a4473056c76e86 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 22 Feb 2019 10:18:48 +0100
Subject: ensure proper icu version is used

---
 el7x.cfg      | 1 +
 el7x55.cfg    | 1 +
 el7x56.cfg    | 1 +
 el7x70.cfg    | 2 +-
 el7x71.cfg    | 1 +
 el7x72.cfg    | 1 +
 el7x73.cfg    | 1 +
 el7xscl54.cfg | 1 +
 el7xscl55.cfg | 1 +
 el7xscl56.cfg | 1 +
 el7xscl70.cfg | 1 +
 el7xscl71.cfg | 1 +
 el7xscl72.cfg | 1 +
 el7xscl73.cfg | 1 +
 14 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/el7x.cfg b/el7x.cfg
index 3d97d7c..def4e09 100644
--- a/el7x.cfg
+++ b/el7x.cfg
@@ -83,6 +83,7 @@ enabled=0
 name=remi public
 baseurl=file:/home/rpmbuild/site/rpms/enterprise/7/remi/x86_64/
 enabled=1
+exclude=libicu62-devel
 
 [remi-test]
 name=remi test
diff --git a/el7x55.cfg b/el7x55.cfg
index fb1c6ee..b289a19 100644
--- a/el7x55.cfg
+++ b/el7x55.cfg
@@ -83,6 +83,7 @@ enabled=0
 name=remi public
 baseurl=file:/home/rpmbuild/site/rpms/enterprise/7/remi/x86_64/
 enabled=1
+exclude=libicu62-devel
 
 [remi-test]
 name=remi test
diff --git a/el7x56.cfg b/el7x56.cfg
index 18b737d..347917f 100644
--- a/el7x56.cfg
+++ b/el7x56.cfg
@@ -83,6 +83,7 @@ enabled=0
 name=remi public
 baseurl=file:/home/rpmbuild/site/rpms/enterprise/7/remi/x86_64/
 enabled=1
+exclude=libicu62-devel
 
 [remi-test]
 name=remi test
diff --git a/el7x70.cfg b/el7x70.cfg
index 26dfbc8..dbc07af 100644
--- a/el7x70.cfg
+++ b/el7x70.cfg
@@ -85,7 +85,7 @@ enabled=0
 name=remi public
 baseurl=file:/home/rpmbuild/site/rpms/enterprise/7/remi/x86_64/
 enabled=1
-exclude=php-pecl-*
+exclude=php-pecl-* libicu62-devel
 
 [remi-test]
 name=remi test
diff --git a/el7x71.cfg b/el7x71.cfg
index e2d6cce..5323234 100644
--- a/el7x71.cfg
+++ b/el7x71.cfg
@@ -48,6 +48,7 @@ syslog_device=
 name=rhel-7
 baseurl=file:/mnt/rhel-7-x86_64/
 enabled=1
+exclude=libicu-devel libicu-last-devel
 
 [rc]
 name=rc
diff --git a/el7x72.cfg b/el7x72.cfg
index b81bda3..8267b74 100644
--- a/el7x72.cfg
+++ b/el7x72.cfg
@@ -48,6 +48,7 @@ syslog_device=
 name=rhel-7
 baseurl=file:/mnt/rhel-7-x86_64/
 enabled=1
+exclude=libicu-devel libicu-last-devel
 
 [rc]
 name=rc
diff --git a/el7x73.cfg b/el7x73.cfg
index daeee7a..4812552 100644
--- a/el7x73.cfg
+++ b/el7x73.cfg
@@ -48,6 +48,7 @@ syslog_device=
 name=rhel-7
 baseurl=file:/mnt/rhel-7-x86_64/
 enabled=1
+exclude=libicu-devel libicu-last-devel
 
 [rc]
 name=rc
diff --git a/el7xscl54.cfg b/el7xscl54.cfg
index 99482e5..ec86838 100644
--- a/el7xscl54.cfg
+++ b/el7xscl54.cfg
@@ -86,6 +86,7 @@ enabled=0
 name=remi public
 baseurl=file:/home/rpmbuild/site/rpms/enterprise/7/remi/x86_64/
 enabled=1
+exclude=libicu62-devel
 
 [remi-test]
 name=remi test
diff --git a/el7xscl55.cfg b/el7xscl55.cfg
index 7e844bc..dbb2078 100644
--- a/el7xscl55.cfg
+++ b/el7xscl55.cfg
@@ -86,6 +86,7 @@ enabled=0
 name=remi public
 baseurl=file:/home/rpmbuild/site/rpms/enterprise/7/remi/x86_64/
 enabled=1
+exclude=libicu62-devel
 
 [remi-test]
 name=remi test
diff --git a/el7xscl56.cfg b/el7xscl56.cfg
index cb2cc53..3d0bc05 100644
--- a/el7xscl56.cfg
+++ b/el7xscl56.cfg
@@ -86,6 +86,7 @@ enabled=0
 name=remi public
 baseurl=file:/home/rpmbuild/site/rpms/enterprise/7/remi/x86_64/
 enabled=1
+exclude=libicu62-devel
 
 [remi-test]
 name=remi test
diff --git a/el7xscl70.cfg b/el7xscl70.cfg
index 157c328..8b028a5 100644
--- a/el7xscl70.cfg
+++ b/el7xscl70.cfg
@@ -88,6 +88,7 @@ enabled=0
 name=remi public
 baseurl=file:/home/rpmbuild/site/rpms/enterprise/7/remi/x86_64/
 enabled=1
+exclude=libicu62-devel
 
 [remi-test]
 name=remi test
diff --git a/el7xscl71.cfg b/el7xscl71.cfg
index 7c9b6bd..a283240 100644
--- a/el7xscl71.cfg
+++ b/el7xscl71.cfg
@@ -51,6 +51,7 @@ syslog_device=
 name=rhel-7
 baseurl=file:/mnt/rhel-7-x86_64/
 enabled=1
+exclude=libicu-devel libicu-last-devel
 
 [rc]
 name=rc
diff --git a/el7xscl72.cfg b/el7xscl72.cfg
index 4ca0f34..1b41d9f 100644
--- a/el7xscl72.cfg
+++ b/el7xscl72.cfg
@@ -51,6 +51,7 @@ syslog_device=
 name=rhel-7
 baseurl=file:/mnt/rhel-7-x86_64/
 enabled=1
+exclude=libicu-devel libicu-last-devel
 
 [rc]
 name=rc
diff --git a/el7xscl73.cfg b/el7xscl73.cfg
index 78eafa6..b92c5e8 100644
--- a/el7xscl73.cfg
+++ b/el7xscl73.cfg
@@ -51,6 +51,7 @@ syslog_device=
 name=rhel-7
 baseurl=file:/mnt/rhel-7-x86_64/
 enabled=1
+exclude=libicu-devel libicu-last-devel
 
 [rc]
 name=rc
-- 
cgit