summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--multiarch-utils.spec12
1 files changed, 11 insertions, 1 deletions
diff --git a/multiarch-utils.spec b/multiarch-utils.spec
index 18a5920..87a9dd8 100644
--- a/multiarch-utils.spec
+++ b/multiarch-utils.spec
@@ -1,6 +1,7 @@
%define name multiarch-utils
-%define version 1.0.6
+%define version 1.0.7
%define release 1mdk
+%define multiarch_distro 1020
Summary: Tools to help creation of multiarch binaries and includes
Name: %{name}
@@ -12,6 +13,9 @@ Group: Development/Other
Url: http://www.mandrakelinux.com/
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+%if %{mdkversion} >= %{multiarch_distro}
+Conflicts: rpm < 4.2.3-5mdk
+%endif
%description
multiarch-utils is a collection of helper utilities to dispatch
@@ -39,8 +43,14 @@ rm -rf $RPM_BUILD_ROOT
%{_sysconfdir}/rpm/macros.multiarch
%{_prefix}/lib/rpm/mkmultiarch
%{_prefix}/lib/rpm/check-multiarch-files
+%{_prefix}/X11R6/lib/X11/config/multiarch-dispatch-host.def
%changelog
+* Wed Feb 23 2005 Gwenole Beauchesne <gbeauchesne@mandrakesoft.com> 1.0.7-1mdk
+- multiarch x11 host.def
+- new heuristics for multiarch files checker (ace-config)
+- only check for multiarch files in the usual development directories
+
* Thu Feb 10 2005 Gwenole Beauchesne <gbeauchesne@mandrakesoft.com> 1.0.6-1mdk
- check-multiarch-files: new multiarch hint: BITS_PER_WORD
- check-multiarch-files: handle --libtool in config scripts