389-ds-base/glibmm24: conflicting perl provides

https://bugzilla.redhat.com/show_bug.cgi?id=523476
Resolves: bug 523476
Bug Description: 389-ds-base/glibmm24: conflicting perl provides
Reviewed by: nhosoi (Thanks!)
Files: see diff
Fix Description: Rename "Util" to "DSUtil"
Platforms tested: Fedora 11 x86_64
Flag Day: no
Doc impact: no

Makefile.am

@@ -87,7 +87,7 @@ CLEANFILES =  dberrstrs.h ns-slapd.properties \
 	ldap/admin/src/scripts/template-saveconfig ldap/admin/src/scripts/template-start-slapd \
 	ldap/admin/src/scripts/template-stop-slapd ldap/admin/src/scripts/template-suffix2instance \
 	ldap/admin/src/scripts/template-upgradedb ldap/admin/src/scripts/template-verify-db.pl \
-	ldap/admin/src/scripts/template-vlvindex ldap/admin/src/scripts/Util.pm \
+	ldap/admin/src/scripts/template-vlvindex ldap/admin/src/scripts/DSUtil.pm \
 	ldap/ldif/template-baseacis.ldif ldap/ldif/template-bitwise.ldif ldap/ldif/template-country.ldif \
 	ldap/ldif/template-dnaplugin.ldif ldap/ldif/template-domain.ldif ldap/ldif/template-dse.ldif \
 	ldap/ldif/template-ldapi-autobind.ldif ldap/ldif/template-ldapi-default.ldif \
@@ -300,7 +300,7 @@ bin_SCRIPTS = ldap/servers/slapd/tools/rsearch/scripts/dbgen.pl \
 # and should not be marked as executable - so use DATA
 perl_DATA = ldap/admin/src/scripts/SetupLog.pm \
 	ldap/admin/src/scripts/Resource.pm \
-	ldap/admin/src/scripts/Util.pm \
+	ldap/admin/src/scripts/DSUtil.pm \
 	ldap/admin/src/scripts/Setup.pm \
 	ldap/admin/src/scripts/SetupDialogs.pm \
 	ldap/admin/src/scripts/Inf.pm \

Makefile.in

@@ -1192,7 +1192,7 @@ CLEANFILES = dberrstrs.h ns-slapd.properties \
 	ldap/admin/src/scripts/template-saveconfig ldap/admin/src/scripts/template-start-slapd \
 	ldap/admin/src/scripts/template-stop-slapd ldap/admin/src/scripts/template-suffix2instance \
 	ldap/admin/src/scripts/template-upgradedb ldap/admin/src/scripts/template-verify-db.pl \
-	ldap/admin/src/scripts/template-vlvindex ldap/admin/src/scripts/Util.pm \
+	ldap/admin/src/scripts/template-vlvindex ldap/admin/src/scripts/DSUtil.pm \
 	ldap/ldif/template-baseacis.ldif ldap/ldif/template-bitwise.ldif ldap/ldif/template-country.ldif \
 	ldap/ldif/template-dnaplugin.ldif ldap/ldif/template-domain.ldif ldap/ldif/template-dse.ldif \
 	ldap/ldif/template-ldapi-autobind.ldif ldap/ldif/template-ldapi-default.ldif \
@@ -1343,7 +1343,7 @@ bin_SCRIPTS = ldap/servers/slapd/tools/rsearch/scripts/dbgen.pl \
 # and should not be marked as executable - so use DATA
 perl_DATA = ldap/admin/src/scripts/SetupLog.pm \
 	ldap/admin/src/scripts/Resource.pm \
-	ldap/admin/src/scripts/Util.pm \
+	ldap/admin/src/scripts/DSUtil.pm \
 	ldap/admin/src/scripts/Setup.pm \
 	ldap/admin/src/scripts/SetupDialogs.pm \
 	ldap/admin/src/scripts/Inf.pm \

ldap/admin/src/scripts/DSCreate.pm.in

@@ -44,7 +44,7 @@
 ##########################
 
 package DSCreate;
-use Util;
+use DSUtil;
 use Inf;
 use FileConn;
 
@@ -198,7 +198,7 @@ sub changeOwnerMode {
 
 sub makeDSDirs {
     my $inf = shift;
-    my $verbose = ($Util::debuglevel > 0);
+    my $verbose = ($DSUtil::debuglevel > 0);
     my $mode = getMode($inf, 7);
     my @errs;
 

ldap/admin/src/scripts/DSDialogs.pm

@@ -44,7 +44,7 @@ use Net::Domain qw(hostname hostfqdn);
 use DialogManager;
 use Setup;
 use Dialog;
-use Util;
+use DSUtil;
 
 my $dsport = new Dialog (
     $TYPICAL,

ldap/admin/src/scripts/DSMigration.pm.in

@@ -48,7 +48,7 @@
 
 package DSMigration;
 use Migration;
-use Util;
+use DSUtil;
 use Inf;
 use DSCreate;
 
@@ -75,7 +75,6 @@ use Exporter;
 use strict;
 
 use SetupLog;
-use Util;
 
 # these are the attributes for which we will always use
 # the new value, or which do not apply anymore

ldap/admin/src/scripts/DSUpdate.pm.in

@@ -44,7 +44,7 @@
 ##########################
 
 package DSUpdate;
-use Util;
+use DSUtil;
 use Inf;
 use FileConn;
 use DSCreate qw(setDefaults createInstanceScripts);

ldap/admin/src/scripts/DSUpdateDialogs.pm

@@ -43,7 +43,7 @@ use strict;
 use DialogManager;
 use Setup;
 use Dialog;
-use Util;
+use DSUtil;
 use FileConn;
 
 my @updateadmindialogs;

ldap/admin/src/scripts/Util.pm.in → ldap/admin/src/scripts/DSUtil.pm.in

@@ -36,7 +36,7 @@
 # END COPYRIGHT BLOCK
 #
 
-package Util;
+package DSUtil;
 
 use Mozilla::LDAP::Conn;
 use Mozilla::LDAP::Utils qw(normalizeDN);
@@ -64,13 +64,13 @@ use File::Path qw(rmtree);
 
 use Carp;
 
-$Util::debuglevel = 0;
+$DSUtil::debuglevel = 0;
 # use like this:
 # debug(3, "message");
 # this will only print "message" if $debuglevel is 3 or higher (-ddd on the command line)
 sub debug {
     my ($level, @rest) = @_;
-    if ($level <= $Util::debuglevel) {
+    if ($level <= $DSUtil::debuglevel) {
         print STDERR "+" x $level, @rest;
     }
 }

ldap/admin/src/scripts/FileConn.pm

@@ -46,7 +46,7 @@ use Mozilla::LDAP::API qw(:constant ldap_explode_dn ldap_err2string); # Direct a
 use Mozilla::LDAP::Utils qw(normalizeDN);
 use Mozilla::LDAP::LDIF;
 
-use Util qw(debug);
+use DSUtil qw(debug);
 
 require    Exporter;
 @ISA       = qw(Exporter Mozilla::LDAP::Conn);

ldap/admin/src/scripts/Migration.pm.in

@@ -71,7 +71,7 @@ use Getopt::Long;
 use File::Temp qw(tempfile tempdir);
 
 use SetupLog;
-use Util;
+use DSUtil;
 
 # process command line options
 Getopt::Long::Configure(qw(bundling)); # bundling allows -ddddd
@@ -184,7 +184,7 @@ sub init {
 
     GetOptions('help|h|?' => sub { VersionMessage(); HelpMessage(); exit 0 },
                'version|v' => sub { VersionMessage(); exit 0 },
-               'debug|d+' => \$Util::debuglevel,
+               'debug|d+' => \$DSUtil::debuglevel,
                'silent|s' => \$silent,
                'file|f=s' => \$inffile,
                'keepcache|k' => \$keep,

ldap/admin/src/scripts/Setup.pm.in

@@ -69,7 +69,7 @@ use Getopt::Long;
 use File::Temp qw(tempfile tempdir);
 
 use SetupLog;
-use Util;
+use DSUtil;
 use Inf;
 
 use strict;
@@ -130,7 +130,7 @@ sub init {
 
     GetOptions('help|h|?' => sub { VersionMessage(); HelpMessage(); exit 0 },
                'version|v' => sub { VersionMessage(); exit 0 },
-               'debug|d+' => \$Util::debuglevel,
+               'debug|d+' => \$DSUtil::debuglevel,
                'silent|s' => \$silent,
                'file|f=s' => \$inffile,
                'keepcache|k' => \$keep,

ldap/admin/src/scripts/SetupDialogs.pm.in

@@ -44,7 +44,7 @@ use DialogManager;
 use Setup;
 use Dialog;
 use Net::Domain qw(hostfqdn);
-use Util;
+use DSUtil;
 
 my $welcome = new DialogYesNo (
     $EXPRESS,

ldap/admin/src/scripts/remove-ds.pl.in

@@ -23,7 +23,7 @@ use strict;
 
 use File::Basename;
 use File::Path;
-use Util;
+use DSUtil;
 use Resource;
 use DSCreate qw(removeDSInstance);
 
@@ -48,7 +48,7 @@ while ($i <= $#ARGV) {
         $i++;
         $instname = $ARGV[$i];
     } elsif ("$ARGV[$i]" eq "-d") {
-        $Util::debuglevel++;
+        $DSUtil::debuglevel++;
     } else {
         &usage; exit(1);
     }

ldap/admin/src/scripts/setup-ds.pl.in

@@ -46,7 +46,7 @@ use SetupLog;
 use Inf;
 use Resource;
 use DialogManager;
-use Util;
+use DSUtil;
 use DSCreate;
 use DSUpdate;