--- rpms/smeserver-extrarepositories/contribs9/smeserver-extrarepositories.spec	2018/03/13 02:10:05	1.7
+++ rpms/smeserver-extrarepositories/contribs9/smeserver-extrarepositories.spec	2018/03/18 09:27:52	1.8
@@ -1,6 +1,6 @@
 %define name smeserver-extrarepositories
 %define version 0.1
-%define release 3
+%define release 4
 Summary: easy configuration of extra yum repo
 Name: %{name}
 Version: %{version}
@@ -18,6 +18,10 @@ AutoReqProv: no
 Provides configuration for external yum repository comaptible with Koozali SME Server.
 
 %changelog
+* Sun Mar 18 2018 Jean-Philipe Pialasse <tests@pialasse.com> 0.1-4.sme
+- exclude ffmpeg-2.6.4 and celt-0.11 from zmrepo [SME: 10543]
+- add Sogo4 repo + migrate to exclude gnustep from epel if sogo repo present 
+
 * Sun Feb 18 2018 Jean-Philipe Pialasse <tests@pialasse.com> 0.1-3.sme
 - fix wrong escape sequence for $basearch and $releasever [SME: 10239]
 
@@ -618,7 +622,7 @@ createrepo
 
 #####################
 #####################
-#Sogo3 nightly
+#Sogo4 nightly
 #####################
 #####################
 REPO['reponame']='sogo4'
@@ -634,7 +638,6 @@ REPO['Exclude']=''
 REPO['IncludePkgs']='gnustep-base,gnustep-make,libmemcached,libwbxml,sogo*,sope49*'
 createrepo
 
-
 #####################
 #####################
 #Sogo stable
@@ -782,11 +785,83 @@ REPO['BaseURL']='http://zmrepo.mehvc.com
 REPO['MirrorList']=''
 REPO['GPGCheck']='no'
 REPO['GPGKey']=""
-REPO['Exclude']=''
+REPO['Exclude']='ffmpeg-2.6.4,celt-0.11'
 REPO['IncludePkgs']=''
 createrepo
 
 
+#####################################################
+# migrates
+######################################################
+mkdir -p $RPM_BUILD_ROOT/etc/e-smith/db/yum_repositories/migrate
+cat << 'EOF'  >$RPM_BUILD_ROOT/etc/e-smith/db/yum_repositories/migrate/90sogo
+{
+    my @add = split(/[,; ]+/, 'gnustep-*');
+    my %remove = map { $_ => 1 } split(/[,; ]+/, '');
+
+    for my $name ( qw(epel) )
+    {
+        my $repo = $DB->get($name) or next;
+
+        my @exclude = split(/,/, $repo->prop('Exclude') || '');
+        push @exclude, @add;
+        @exclude = grep(!defined $remove{$_} && !/^CENTOS_/, @exclude);
+
+        # remove duplicates
+        undef %saw;
+        @exclude = grep(!$saw{$_}++, @exclude);
+
+        if ($#exclude >= 0)
+        {
+            $repo->set_prop('Exclude', join(',', @exclude));
+        }
+        else
+        {
+            $repo->delete('Exclude');
+        }
+    }
+}
+
+EOF
+
+
+cat << 'EOF'  >$RPM_BUILD_ROOT/etc/e-smith/db/yum_repositories/migrate/10epel
+{
+    my @add = split(/[,; ]+/, '');
+    my %remove = map { $_ => 1 } split(/[,; ]+/, 'gnustep-*,gnustep*,gnustep-base,gnustep-make');
+
+    for my $name ( qw(epel) )
+    {
+        my $repo = $DB->get($name) or next;
+
+        my @exclude = split(/,/, $repo->prop('Exclude') || '');
+        push @exclude, @add;
+        @exclude = grep(!defined $remove{$_} && !/^CENTOS_/, @exclude);
+
+        # remove duplicates
+        undef %saw;
+        @exclude = grep(!$saw{$_}++, @exclude);
+
+        if ($#exclude >= 0)
+        {
+            $repo->set_prop('Exclude', join(',', @exclude));
+        }
+        else
+        {
+            $repo->delete('Exclude');
+        }
+    }
+}
+
+EOF
+
+
+
+
+
+
+##########################################################
+
 rm -f %{name}-%{version}-filelist*
 /sbin/e-smith/genfilelist $RPM_BUILD_ROOT 			> %{name}-%{version}-filelist
 cat %{name}-%{version}-filelist| grep atomic			> %{name}-%{version}-filelist-atomic