From bde973d412e61daae9a5a52e3a19b8cbae90fa3c Mon Sep 17 00:00:00 2001 From: Olivier Thauvin Date: Thu, 23 Jun 2005 02:29:54 +0000 Subject: - add requirement for update --- ChangeLog | 4 ++++ rpm-mandriva-setup.spec | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 3d5cc92..e72192a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2005-06-22 14:00 Olivier Thauvin + + * rpm-mandriva-setup.spec: - split for dep + 2005-06-17 06:50 Olivier Thauvin * rpmrc.in: < spturtle> can you remove -frename-registers, it might diff --git a/rpm-mandriva-setup.spec b/rpm-mandriva-setup.spec index 1c369d9..e0b894f 100644 --- a/rpm-mandriva-setup.spec +++ b/rpm-mandriva-setup.spec @@ -1,6 +1,6 @@ %define name rpm-mandriva-setup %define version 1.1 -%define release %mkrel 2 +%define release %mkrel 3 # This can be usefull for backport as rpm-4.2 # provide the emacs-spec mode @@ -30,6 +30,7 @@ The Mandriva rpm configuration and scripts Group: System/Configuration/Packaging Summary: The Mandriva rpm configuration and scripts to build rpms Requires: spec-helper >= 0.6-5mdk +Requires: %name = %version-%release %if have_emacsmodespec Conflicts: rpm < 4.4.1 %endif @@ -90,6 +91,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Thu Jun 23 2005 Olivier Thauvin 1.1-3mdk +- enforce requirement to avoid conflict during update + * Wed Jun 22 2005 Olivier Thauvin 1.1-2mdk - split package for dep -- cgit v1.2.1