tweak config for libicu and msodbcsql

25 files changed, 16 insertions, 26 deletions

diff --git a/el7x71.cfg b/el7x71.cfg
index 5323234..c6633c1 100644
--- a/el7x71.cfg
+++ b/el7x71.cfg
@@ -48,7 +48,7 @@ syslog_device=
 name=rhel-7
 baseurl=file:/mnt/rhel-7-x86_64/
 enabled=1
-exclude=libicu-devel libicu-last-devel
+exclude=libicu-devel
 
 [rc]
 name=rc
@@ -89,7 +89,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-*  libicu-last-devel
 
 [remi-test]
 name=remi test
diff --git a/el7x72.cfg b/el7x72.cfg
index 8267b74..8f5c59b 100644
--- a/el7x72.cfg
+++ b/el7x72.cfg
@@ -48,7 +48,7 @@ syslog_device=
 name=rhel-7
 baseurl=file:/mnt/rhel-7-x86_64/
 enabled=1
-exclude=libicu-devel libicu-last-devel
+exclude=libicu-devel
 
 [rc]
 name=rc
@@ -89,7 +89,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-*  libicu-last-devel
 
 [remi-test]
 name=remi test
diff --git a/el7x73.cfg b/el7x73.cfg
index 4812552..25435f9 100644
--- a/el7x73.cfg
+++ b/el7x73.cfg
@@ -48,7 +48,7 @@ syslog_device=
 name=rhel-7
 baseurl=file:/mnt/rhel-7-x86_64/
 enabled=1
-exclude=libicu-devel libicu-last-devel
+exclude=libicu-devel
 
 [rc]
 name=rc
@@ -89,7 +89,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-*  libicu-last-devel
 
 [remi-test]
 name=remi test
diff --git a/el7xscl71.cfg b/el7xscl71.cfg
index a283240..b60a317 100644
--- a/el7xscl71.cfg
+++ b/el7xscl71.cfg
@@ -51,7 +51,7 @@ syslog_device=
 name=rhel-7
 baseurl=file:/mnt/rhel-7-x86_64/
 enabled=1
-exclude=libicu-devel libicu-last-devel
+exclude=libicu-devel
 
 [rc]
 name=rc
@@ -91,6 +91,7 @@ enabled=0
 [remi]
 name=remi public
 baseurl=file:/home/rpmbuild/site/rpms/enterprise/7/remi/x86_64/
+exclude=libicu-last-devel
 enabled=1
 
 [remi-test]
diff --git a/el7xscl72.cfg b/el7xscl72.cfg
index 1b41d9f..0224db6 100644
--- a/el7xscl72.cfg
+++ b/el7xscl72.cfg
@@ -51,7 +51,7 @@ syslog_device=
 name=rhel-7
 baseurl=file:/mnt/rhel-7-x86_64/
 enabled=1
-exclude=libicu-devel libicu-last-devel
+exclude=libicu-devel
 
 [rc]
 name=rc
@@ -91,6 +91,7 @@ enabled=0
 [remi]
 name=remi public
 baseurl=file:/home/rpmbuild/site/rpms/enterprise/7/remi/x86_64/
+exclude=libicu-last-devel
 enabled=1
 
 [remi-test]
diff --git a/el7xscl73.cfg b/el7xscl73.cfg
index b92c5e8..59a3eeb 100644
--- a/el7xscl73.cfg
+++ b/el7xscl73.cfg
@@ -51,7 +51,7 @@ syslog_device=
 name=rhel-7
 baseurl=file:/mnt/rhel-7-x86_64/
 enabled=1
-exclude=libicu-devel libicu-last-devel
+exclude=libicu-devel
 
 [rc]
 name=rc
@@ -91,6 +91,7 @@ enabled=0
 [remi]
 name=remi public
 baseurl=file:/home/rpmbuild/site/rpms/enterprise/7/remi/x86_64/
+exclude=libicu-last-devel
 enabled=1
 
 [remi-test]
diff --git a/fc27x.cfg b/fc27x.cfg
index 9110862..930bd1c 100644
--- a/fc27x.cfg
+++ b/fc27x.cfg
@@ -132,6 +132,5 @@ enabled=1
 name=msprod
 baseurl=https://packages.microsoft.com/rhel/7/prod/
 enabled=1
-includepkgs=msodbcsql
 
 """
diff --git a/fc27xscl56.cfg b/fc27xscl56.cfg
index 875e6a7..2cfa307 100644
--- a/fc27xscl56.cfg
+++ b/fc27xscl56.cfg
@@ -84,6 +84,7 @@ enabled=0
 name=remi public
 baseurl=file:/home/rpmbuild/site/rpms/fedora/27/remi/x86_64/
 enabled=1
+exclude=libicu62-devel
 metadata_expire=1
 
 [remi-priv]
diff --git a/fc27xscl70.cfg b/fc27xscl70.cfg
index 441e806..b7d1d67 100644
--- a/fc27xscl70.cfg
+++ b/fc27xscl70.cfg
@@ -87,6 +87,7 @@ enabled=0
 name=remi public
 baseurl=file:/home/rpmbuild/site/rpms/fedora/27/remi/x86_64/
 enabled=1
+exclude=libicu62-devel
 metadata_expire=1
 
 [remi-priv]
@@ -141,6 +142,5 @@ metadata_expire=1
 name=msprod
 baseurl=https://packages.microsoft.com/rhel/7/prod/
 enabled=1
-includepkgs=msodbcsql
 
 """
diff --git a/fc27xscl71.cfg b/fc27xscl71.cfg
index 439ad47..c7ac922 100644
--- a/fc27xscl71.cfg
+++ b/fc27xscl71.cfg
@@ -141,6 +141,5 @@ metadata_expire=1
 name=msprod
 baseurl=https://packages.microsoft.com/rhel/7/prod/
 enabled=1
-includepkgs=msodbcsql
 
 """
diff --git a/fc27xscl72.cfg b/fc27xscl72.cfg
index 7ce2589..17d8024 100644
--- a/fc27xscl72.cfg
+++ b/fc27xscl72.cfg
@@ -142,6 +142,5 @@ metadata_expire=1
 name=msprod
 baseurl=https://packages.microsoft.com/rhel/7/prod/
 enabled=1
-includepkgs=msodbcsql
 
 """
diff --git a/fc27xscl73.cfg b/fc27xscl73.cfg
index 758c651..e5a011e 100644
--- a/fc27xscl73.cfg
+++ b/fc27xscl73.cfg
@@ -142,6 +142,5 @@ metadata_expire=1
 name=msprod
 baseurl=https://packages.microsoft.com/rhel/7/prod/
 enabled=1
-includepkgs=msodbcsql
 
 """
diff --git a/fc27xt.cfg b/fc27xt.cfg
index 6b211b5..848eff5 100644
--- a/fc27xt.cfg
+++ b/fc27xt.cfg
@@ -133,6 +133,5 @@ enabled=1
 name=msprod
 baseurl=https://packages.microsoft.com/rhel/7/prod/
 enabled=1
-includepkgs=msodbcsql
 
 """
diff --git a/fc28x.cfg b/fc28x.cfg
index 94103ba..88def6d 100644
--- a/fc28x.cfg
+++ b/fc28x.cfg
@@ -137,6 +137,5 @@ enabled=1
 name=msprod
 baseurl=https://packages.microsoft.com/rhel/7/prod/
 enabled=1
-includepkgs=msodbcsql
 
 """
diff --git a/fc28xscl56.cfg b/fc28xscl56.cfg
index 5ac9962..d327b97 100644
--- a/fc28xscl56.cfg
+++ b/fc28xscl56.cfg
@@ -84,6 +84,7 @@ enabled=0
 name=remi public
 baseurl=file:/home/rpmbuild/site/rpms/fedora/28/remi/x86_64/
 enabled=1
+exclude=libicu62-devel
 metadata_expire=1
 
 [remi-priv]
diff --git a/fc28xscl70.cfg b/fc28xscl70.cfg
index 52049b4..dde8566 100644
--- a/fc28xscl70.cfg
+++ b/fc28xscl70.cfg
@@ -87,6 +87,7 @@ enabled=0
 name=remi public
 baseurl=file:/home/rpmbuild/site/rpms/fedora/28/remi/x86_64/
 enabled=1
+exclude=libicu62-devel
 metadata_expire=1
 
 [remi-priv]
@@ -141,6 +142,5 @@ metadata_expire=1
 name=msprod
 baseurl=https://packages.microsoft.com/rhel/7/prod/
 enabled=1
-includepkgs=msodbcsql
 
 """
diff --git a/fc28xscl71.cfg b/fc28xscl71.cfg
index ab9b54e..ee5bc0c 100644
--- a/fc28xscl71.cfg
+++ b/fc28xscl71.cfg
@@ -141,6 +141,5 @@ metadata_expire=1
 name=msprod
 baseurl=https://packages.microsoft.com/rhel/7/prod/
 enabled=1
-includepkgs=msodbcsql
 
 """
diff --git a/fc28xscl72.cfg b/fc28xscl72.cfg
index 61d10ca..0262d3a 100644
--- a/fc28xscl72.cfg
+++ b/fc28xscl72.cfg
@@ -142,6 +142,5 @@ metadata_expire=1
 name=msprod
 baseurl=https://packages.microsoft.com/rhel/7/prod/
 enabled=1
-includepkgs=msodbcsql
 
 """
diff --git a/fc28xscl73.cfg b/fc28xscl73.cfg
index 6173559..9847818 100644
--- a/fc28xscl73.cfg
+++ b/fc28xscl73.cfg
@@ -142,6 +142,5 @@ metadata_expire=1
 name=msprod
 baseurl=https://packages.microsoft.com/rhel/7/prod/
 enabled=1
-includepkgs=msodbcsql
 
 """
diff --git a/fc29x.cfg b/fc29x.cfg
index d04bd11..a89eaea 100644
--- a/fc29x.cfg
+++ b/fc29x.cfg
@@ -131,6 +131,5 @@ enabled=1
 name=msprod
 baseurl=https://packages.microsoft.com/rhel/7/prod/
 enabled=1
-includepkgs=msodbcsql
 
 """
diff --git a/fc29xscl70.cfg b/fc29xscl70.cfg
index b709db3..aa0de46 100644
--- a/fc29xscl70.cfg
+++ b/fc29xscl70.cfg
@@ -141,6 +141,5 @@ metadata_expire=1
 name=msprod
 baseurl=https://packages.microsoft.com/rhel/7/prod/
 enabled=1
-includepkgs=msodbcsql
 
 """
diff --git a/fc29xscl71.cfg b/fc29xscl71.cfg
index 63e8c4e..a395209 100644
--- a/fc29xscl71.cfg
+++ b/fc29xscl71.cfg
@@ -141,6 +141,5 @@ metadata_expire=1
 name=msprod
 baseurl=https://packages.microsoft.com/rhel/7/prod/
 enabled=1
-includepkgs=msodbcsql
 
 """
diff --git a/fc29xscl72.cfg b/fc29xscl72.cfg
index c929f20..c446233 100644
--- a/fc29xscl72.cfg
+++ b/fc29xscl72.cfg
@@ -142,6 +142,5 @@ metadata_expire=1
 name=msprod
 baseurl=https://packages.microsoft.com/rhel/7/prod/
 enabled=1
-includepkgs=msodbcsql
 
 """
diff --git a/fc29xscl73.cfg b/fc29xscl73.cfg
index 5df675e..0b415d7 100644
--- a/fc29xscl73.cfg
+++ b/fc29xscl73.cfg
@@ -142,6 +142,5 @@ metadata_expire=1
 name=msprod
 baseurl=https://packages.microsoft.com/rhel/7/prod/
 enabled=1
-includepkgs=msodbcsql
 
 """
diff --git a/fc30x.cfg b/fc30x.cfg
index d99fb05..5d62ef8 100644
--- a/fc30x.cfg
+++ b/fc30x.cfg
@@ -131,6 +131,5 @@ enabled=1
 name=msprod
 baseurl=https://packages.microsoft.com/rhel/7/prod/
 enabled=1
-includepkgs=msodbcsql
 
 """