--- builds_bin/update_repos	2019/02/08 06:26:53	1.91
+++ builds_bin/update_repos	2020/11/26 18:37:39	1.93
@@ -24,7 +24,7 @@ $opts{r} ||= '';
 
 my $rpm_flags = RPM2->vsf_nodsaheader | RPM2->vsf_norsaheader | RPM2->vsf_nodsa | RPM2->vsf_norsa;
 
-my $osdir = 'SME';
+my $osdir = 'Packages';
 my $disttag = 'sme';
 my $repotag = 'sme';
 
@@ -95,6 +95,8 @@ my $repos = { "${repotag}os"
 # list here the path on our local mirror to each upstream and our mirrors
 # ~A will be expanded to architecture
 # ~C will be expanded to Centos main version number, i.e. 7 for SME 10. 
+# ~s will be expanded to SME version
+# ~S expanded to repo root
 my $baserepo = { "~S${repotag}os/~A/" => "${repotag}os",
                  "~S${repotag}updates/~A/" => "${repotag}updates",
                  "~S${repotag}updates-testing/~A/" => "${repotag}updates-testing",
@@ -143,9 +145,9 @@ my $skippkg = { '8'  => { 'atrpms'
                           'rpmforge'      => { map { $_ => 1 } ( 'perl-CGI', 'perl-Compress-Raw-Zlib', 'perl-ExtUtils-ParseXS', 'perl-Pod-Escapes', 'perl-Pod-Simple', 'perl-Time-HiRes', 'perl-version', 'spamassassin', 'portreserve', 'perl-libwww-perl' , 'lzo', 'perl-BSD-Resource', 'perl-Convert-ASN1', 'perl-DBD-SQLite', 'perl-Devel-StackTrace', 'perl-Digest-SHA1', 'perl-JSON', 'perl-MIME-tools', 'perl-MailTools', 'perl-PPI', 'perl-URI', 'perl-XML-NamespaceSupport', 'perl-XML-Parser', 'perl-XML-SAX-Writer', 'perl-YAML-Syck', 'proftpd', 'syslinux') },
                         },
                 '10' => {
-			  'centos'        => { map { $_ => 1 } ( 'samba' ) },
 			  'epel'	  => { map { $_ => 1 } ( 'clamav') }, 
                           'epeltesting'   => { map { $_ => 1 } ( 'clamav', 'tidy') }, 
+			  'openfusion'    => { map { $_ => 1 } ( 'daemontools-encore') },
                         },
               };
 
@@ -161,7 +163,7 @@ my $onlypkg = { '8' => {
 			  'remi' => { },
 			},
                 '10' => {
-			  'openfusion' => { },
+			  'openfusion' => {map { $_ => 1 } ( 'perl-Carp', 'perl-Scalar-List-Utils', 'perl-Class-Method-Modifiers', 'perl-B-Hooks-OP-Check', 'perl-Sub-Exporter-Progressive', 'perl-Devel-GlobalDestruction', 'perl-Socket', 'perl-Data-Validate-IP', 'perl-Eval-Closure', 'perl-Params-Classify', 'perl-Module-Runtime', 'perl-Module-Implementation', 'perl-Class-Load-XS', 'perl-MooX-Types-MooseLike', 'perl-Hash-FieldHash', 'perl-Algorithm-C3', 'perl-Class-C3', 'perl-MRO-Compat', 'perl-Class-XSAccessor', 'perl-ExtUtils-Manifest', 'perl-IPC-Cmd', 'perl-Module-Build', 'perl-ExtUtils-CBuilder', 'perl-Perl-OSType', 'perl-ExtUtils-Install', 'perl-Params-Validate', 'perl-Sub-Name', 'perl-Sub-Quote', 'perl-Sub-Identify', 'perl-Role-Tiny', 'perl-File-HomeDir', 'perl-Data-Dumper-Concise', 'perl-multidimensional', 'perl-Test-Warnings', 'perl-Term-ANSIColor', 'perl-Task-Weaken', 'perl-Clone-PP', 'perl-Data-IEEE754', 'perl-DateTime-TimeZone', 'perl-Exporter-Tiny', 'perl-List-AllUtils', 'perl-Dist-CheckConflicts', 'perl-Moose', 'perl-DateTime-Locale', 'perl-DateTime', 'perl-Variable-Magic', 'perl-B-Hooks-EndOfScope', 'perl-namespace-clean', 'perl-namespace-autoclean', 'perl-Lexical-SealRequireHints', 'perl-bareword-filehandles', 'perl-indirect', 'perl-strictures', 'perl-Moo', 'perl-MooX-StrictConstructor', 'perl-Throwable', 'perl-Math-Int64', 'perl-Math-Int128', 'perl-MaxMind-DB-Common', 'perl-Net-Works', 'perl-Sort-Naturally', 'perl-Data-Printer', 'perl-MaxMind-DB-Reader', 'perl-GeoIP2', 'perl-Data-OptList','perl-Class-Load', 'perl-App-cpanminus', 'perl-Array-Compare', 'perl-Unicode-IMAPUtf7', 'perl-Filesys-DiskFree') },
 			  'remi' => { map { $_ => 1 } ( 'php-pear' )},
                         },
 };
@@ -570,7 +572,7 @@ foreach my $ver ( sort { $a <=> $b } key
                 my $checksum = "--checksum $distrepo->{$ver}->{checksum}";
 
                 my $exclude = "";
-                $exclude .= " --exclude ${osdir}/*" if -d "$dir/Packages";
+                $exclude .= " --exclude ${osdir}/*" if ( -d "$dir/Packages" &&  ${osdir} ne "Packages" );
                 $exclude .= " --exclude *smeserver-release*.rpm" if $dir =~ m{test/|-testing/};
 
                 my $groupfile = "";