From 7ddd9614144242b8493e526034be54b636b2b842 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gwenol=C3=A9=20Beauchesne?= <gbeauchesne@mandriva.org>
Date: Wed, 12 Jan 2005 17:56:32 +0000
Subject: fix packaging

---
 Makefile             |  3 ++-
 multiarch-utils.spec | 10 ++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index eb5bd31..30c239c 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,8 @@ includedir	= $(prefix)/include
 
 BINARIES	= mkmultiarch multiarch-platform multiarch-dispatch
 INCLUDES	= multiarch-dispatch.h
-FILES		= $(BINARIES) $(INCLUDES)
+OTHER_FILES	= Makefile multiarch-utils.spec ChangeLog
+FILES		= $(BINARIES) $(INCLUDES) $(OTHER_FILES)
 
 PACKAGE		= multiarch-utils
 VERSION		:= $(shell rpm -q --qf %{VERSION} --specfile $(PACKAGE).spec)
diff --git a/multiarch-utils.spec b/multiarch-utils.spec
index c7d0666..240b0b3 100644
--- a/multiarch-utils.spec
+++ b/multiarch-utils.spec
@@ -10,7 +10,8 @@ Source0:	%{name}-%{version}.tar.bz2
 License:	GPL
 Group:		Development/Other
 Url:		http://www.mandrakelinux.com/
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildArch:	noarch
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
 %description
 multiarch-utils is a collection of utilities, including:
@@ -27,13 +28,18 @@ multiarch-utils is a collection of utilities, including:
 %install
 rm -rf $RPM_BUILD_ROOT
 
+%makeinstall_std
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-
+%doc ChangeLog
+%{_bindir}/mkmultiarch
+%{_bindir}/multiarch-platform
+%{_bindir}/multiarch-dispatch
+%{_includedir}/multiarch-dispatch.h
 
 %changelog
 * Wed Jan 12 2005 Gwenole Beauchesne <gbeauchesne@mandrakesoft.com> 1.0-1mdk
-- 
cgit v1.2.1