diff options
| author | Rich Megginson <rmeggins@redhat.com> | 2009-09-21 15:30:00 -0600 |
|---|---|---|
| committer | Rich Megginson <rmeggins@redhat.com> | 2009-09-21 20:03:14 -0600 |
| commit | c11f1818c19233bdb6e54823b0c1352d4377fb75 (patch) | |
| tree | 4e999cc2611da036ae7de5fe98bcbacff0cd84e6 /Makefile.am | |
| parent | cc89083f1177606d4cbbb52f8cdc5e34d0d16f70 (diff) | |
| download | ds-c11f1818c19233bdb6e54823b0c1352d4377fb75.tar.gz ds-c11f1818c19233bdb6e54823b0c1352d4377fb75.tar.xz ds-c11f1818c19233bdb6e54823b0c1352d4377fb75.zip | |
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
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 49c345f2..f7931206 100644 --- a/Makefile.am +++ b/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 \ |