summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaouda Lo <daouda@mandriva.com>2004-07-17 10:20:58 +0000
committerDaouda Lo <daouda@mandriva.com>2004-07-17 10:20:58 +0000
commitf0489fa7212b0023c80f1314f522097d73a54650 (patch)
tree30458703275588a3dd1c29386643e0bd488aee24
parent8c78534c91904b3488e0ed4f32df9442e377e1d9 (diff)
downloadmgaonline-f0489fa7212b0023c80f1314f522097d73a54650.tar
mgaonline-f0489fa7212b0023c80f1314f522097d73a54650.tar.gz
mgaonline-f0489fa7212b0023c80f1314f522097d73a54650.tar.bz2
mgaonline-f0489fa7212b0023c80f1314f522097d73a54650.tar.xz
mgaonline-f0489fa7212b0023c80f1314f522097d73a54650.zip
- fix conflicts (fcrozat)
-rw-r--r--mdkonline.spec7
1 files changed, 5 insertions, 2 deletions
diff --git a/mdkonline.spec b/mdkonline.spec
index a3c94d92..2b9738cc 100644
--- a/mdkonline.spec
+++ b/mdkonline.spec
@@ -4,7 +4,7 @@
Summary: The MandrakeOnline Tool
Name: %{name}
Version: %{version}
-Release: 4mdk
+Release: 5mdk
Source0: %{name}-%{version}.tar.bz2
URL: http://www.mandrakeonline.net
Packager: Daouda Lo <daouda@mandrakesoft.com>
@@ -19,7 +19,7 @@ BuildArch: noarch
Summary: MandrakeOnline libraries and background tools
Group: System/Configuration/Other
Requires: drakxtools-newt >= 10-54mdk
-Conflicts: %{name} < 1.1-3mdk
+Conflicts: %{name} < 1.1-4mdk
%description
The MandrakeOnline tool is designed for registered users
@@ -114,6 +114,9 @@ rm -rf $RPM_BUILD_ROOT
# get the source from our cvs repository (see
# http://www.linuxmandrake.com/en/cvs.php3)
%changelog
+* Sat Jul 17 2004 Daouda LO <daouda@mandrakesoft.com> 1.1-5mdk
+- fix conflicts (fcrozat)
+
* Fri Jul 16 2004 Daouda LO <daouda@mandrakesoft.com> 1.1-4mdk
- added mdkonline backend package for derivative products
(MNF, Corporate ...)