diff options
| author | Florent Villard <warly@mandriva.com> | 2003-03-02 16:23:03 +0000 |
|---|---|---|
| committer | Florent Villard <warly@mandriva.com> | 2003-03-02 16:23:03 +0000 |
| commit | ab466b0ca153d32c641d8acf9cd42d7d70bf80fa (patch) | |
| tree | 71249324983f2493766d9490ff5f7d05365026f7 | |
| parent | fa4374712f745c27fce46f99c575fba6f03fc251 (diff) | |
| download | drakwizard-ab466b0ca153d32c641d8acf9cd42d7d70bf80fa.tar drakwizard-ab466b0ca153d32c641d8acf9cd42d7d70bf80fa.tar.gz drakwizard-ab466b0ca153d32c641d8acf9cd42d7d70bf80fa.tar.bz2 drakwizard-ab466b0ca153d32c641d8acf9cd42d7d70bf80fa.tar.xz drakwizard-ab466b0ca153d32c641d8acf9cd42d7d70bf80fa.zip | |
fix conflict in drakwizard.pl
| -rw-r--r-- | drakwizard.spec | 1 | ||||
| -rw-r--r-- | web_wizard/web.wiz | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drakwizard.spec b/drakwizard.spec index 5fc99271..08d38d58 100644 --- a/drakwizard.spec +++ b/drakwizard.spec @@ -59,6 +59,7 @@ rm -rf $RPM_BUILD_DIR/$RPM_PACKAGE_NAME - replace shell function for chek_masquerade and check_relay by perl ones - restart postfix at the end of postfix configuration - fix summary not returning right combo boxes and boolean values +- remove unused dir field in ftp wizard * Thu Dec 19 2002 Arnaud Desmons <adesmons@mandrakesoft.com> 1.1-1mdk - fix to get png images with gtk2 diff --git a/web_wizard/web.wiz b/web_wizard/web.wiz index 933ddf6a..bb7ec2c3 100644 --- a/web_wizard/web.wiz +++ b/web_wizard/web.wiz @@ -8,7 +8,7 @@ imagePosition="top" defaultImage="__WIZ_HOME__/web_wizard/images/apache.png" perlModule="__WIZ_HOME__/web_wizard/scripts/Webconf.pm" - rpm="apache" + rpm="apache2" summaryFunc="do_it" > |