summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--skip.list3
-rw-r--r--urpmi.spec8
2 files changed, 6 insertions, 5 deletions
diff --git a/skip.list b/skip.list
index ed3c6736..c6bf7132 100644
--- a/skip.list
+++ b/skip.list
@@ -1,4 +1 @@
# Here you can specify the package you don't want to install
-# by default apache2-conf is added due to obsoletes of package of
-# the main distro which cause it to be selected.
-apache2-conf
diff --git a/urpmi.spec b/urpmi.spec
index 946693a7..0faeb38d 100644
--- a/urpmi.spec
+++ b/urpmi.spec
@@ -2,14 +2,14 @@
Name: urpmi
Version: 4.0
-Release: 17mdk
+Release: 18mdk
License: GPL
Source0: %{name}.tar.bz2
Source1: %{name}.logrotate
Summary: User mode rpm install
URL: http://cvs.mandrakesoft.com/cgi-bin/cvsweb.cgi/soft/urpmi
Requires: eject webfetch perl-DateManip >= 5.40
-PreReq: perl-Locale-gettext rpmtools >= 4.3-6mdk perl-URPM >= 0.70-8mdk
+PreReq: perl-Locale-gettext rpmtools >= 4.3-6mdk perl-URPM >= 0.70-9mdk
BuildRequires: bzip2-devel gettext rpm-devel >= 4.0.3
BuildRoot: %{_tmppath}/%{name}-buildroot
BuildArch: noarch
@@ -202,6 +202,10 @@ fi
%changelog
+* Fri Sep 13 2002 François Pons <fpons@mandrakesoft.com> 4.0-18mdk
+- removed apache2-conf from skip.list as it doesn't work
+ when trying to install apache2.
+
* Thu Sep 12 2002 François Pons <fpons@mandrakesoft.com> 4.0-17mdk
- fixed possible no clean of distributed module.
- added apache2-conf to skip.list by default.