[Ipmitool-cvs] ipmitool/control rpmmacros.in,NONE,1.1 Makefile.am,1.3,1.4 ipmitool.spec.in,1.10,1.11 rpmmacros,1.1,NONE

[Duncan L. <ice...@us...>]

Update of /cvsroot/ipmitool/ipmitool/control
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28712/control

Modified Files:
	Makefile.am ipmitool.spec.in 
Added Files:
	rpmmacros.in 
Removed Files:
	rpmmacros 
Log Message:
add configure option for specifying a distro tag for "make rpm" builds


--- rpmmacros DELETED ---

--- NEW FILE: rpmmacros.in ---
%_topdir	%(echo $BUILDDIR)
%_sourcedir     %{_topdir}/..
%_specdir       %{_sourcedir}
%_tmppath	%{_topdir}/tmp
%_builddir	%{_topdir}/BUILD
%_buildroot	%{_topdir}/%{_tmppath}/%{name}-%{version}-root
%_rpmdir	%{_topdir}/RPMS
%_srcrpmdir	%{_topdir}/SRPMS
%_distro	@DISTRO@
%_rpmfilename	%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm
%packager	du...@ic...
%distribution	Sourceforge Build

Index: ipmitool.spec.in
===================================================================
RCS file: /cvsroot/ipmitool/ipmitool/control/ipmitool.spec.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ipmitool.spec.in	18 May 2005 23:51:17 -0000	1.10
--- ipmitool.spec.in	16 Jun 2005 23:56:32 -0000	1.11
***************
*** 33,36 ****
--- 33,37 ----
  %build
  ./configure --with-kerneldir \
+ 	--with-rpm-distro=@DISTRO@ \
  	--prefix=%{_prefix} \
  	--bindir=%{_bindir} \

Index: Makefile.am
===================================================================
RCS file: /cvsroot/ipmitool/ipmitool/control/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile.am	27 Aug 2004 15:59:25 -0000	1.3
--- Makefile.am	16 Jun 2005 23:56:32 -0000	1.4
***************
*** 35,41 ****
  MAINTAINERCLEANFILES	= Makefile.in
  
! EXTRA_DIST		= pkginfo.in prototype.in ipmitool.spec.in \
! 			  rpmrc rpmmacros
  
! dist-hook: pkginfo prototype
  
--- 35,41 ----
  MAINTAINERCLEANFILES	= Makefile.in
  
! EXTRA_DIST		= pkginfo.in prototype.in \
! 			  ipmitool.spec.in rpmmacros.in rpmrc
  
! dist-hook: pkginfo prototype rpmmacros