rpms/mach/EL-5 mach-0.9.2-centos4rhel.patch, NONE, 1.1 mach.spec, 1.12, 1.13

[Ville Skytta (scop)]

Author: scop

Update of /cvs/pkgs/rpms/mach/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2004

Modified Files:
	mach.spec 
Added Files:
	mach-0.9.2-centos4rhel.patch 
Log Message:
* Thu Sep 13 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.9.2-3.1
- Patch to default to CentOS configs also when built on RHEL.


mach-0.9.2-centos4rhel.patch:

--- NEW FILE mach-0.9.2-centos4rhel.patch ---
diff -up mach-0.9.2/configure.in~ mach-0.9.2/configure.in
--- mach-0.9.2/configure.in~	2007-09-08 17:46:55.000000000 +0300
+++ mach-0.9.2/configure.in	2007-09-13 19:10:23.000000000 +0300
@@ -110,8 +110,11 @@ CHECK_RELEASE(redhat,    "(Psyche)",    
 CHECK_RELEASE(redhat,    "(Shrike)",     defaultroot="redhat-9-$arch")
 
 CHECK_RELEASE(redhat, "CentOS release 3",defaultroot="centos-3-$arch")
+CHECK_RELEASE(redhat,    "(Taroon)",     defaultroot="centos-3-$arch")
 CHECK_RELEASE(redhat, "CentOS release 4",defaultroot="centos-4-$arch")
+CHECK_RELEASE(redhat,    "(Nahant)",     defaultroot="centos-4-$arch")
 CHECK_RELEASE(redhat, "CentOS release 5",defaultroot="centos-5-$arch")
+CHECK_RELEASE(redhat,    "(Tikanga)",    defaultroot="centos-5-$arch")
 
 CHECK_RELEASE(yellowdog, "(Sirius)",     defaultroot="yellowdog-30-ppc")
 
diff -up mach-0.9.2/configure~ mach-0.9.2/configure
--- mach-0.9.2/configure~	2007-09-08 17:47:07.000000000 +0300
+++ mach-0.9.2/configure	2007-09-13 19:10:23.000000000 +0300
@@ -19944,6 +19944,25 @@ echo "${ECHO_T}not found" >&6; }
 
 
   DIST=redhat
+  NAME="(Taroon)"
+
+  if test -f /etc/$DIST-release
+  then
+    { echo "$as_me:$LINENO: checking /etc/$DIST-release for $NAME" >&5
+echo $ECHO_N "checking /etc/$DIST-release for $NAME... $ECHO_C" >&6; }
+    if grep "$NAME" /etc/$DIST-release > /dev/null; then
+      { echo "$as_me:$LINENO: result: found" >&5
+echo "${ECHO_T}found" >&6; }
+      defaultroot="centos-3-$arch"
+    else
+      { echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6; }
+      :
+    fi
+  fi
+
+
+  DIST=redhat
   NAME="CentOS release 4"
 
   if test -f /etc/$DIST-release
@@ -19963,6 +19982,25 @@ echo "${ECHO_T}not found" >&6; }
 
 
   DIST=redhat
+  NAME="(Nahant)"
+
+  if test -f /etc/$DIST-release
+  then
+    { echo "$as_me:$LINENO: checking /etc/$DIST-release for $NAME" >&5
+echo $ECHO_N "checking /etc/$DIST-release for $NAME... $ECHO_C" >&6; }
+    if grep "$NAME" /etc/$DIST-release > /dev/null; then
+      { echo "$as_me:$LINENO: result: found" >&5
+echo "${ECHO_T}found" >&6; }
+      defaultroot="centos-4-$arch"
+    else
+      { echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6; }
+      :
+    fi
+  fi
+
+
+  DIST=redhat
   NAME="CentOS release 5"
 
   if test -f /etc/$DIST-release
@@ -19981,6 +20019,25 @@ echo "${ECHO_T}not found" >&6; }
   fi
 
 
+  DIST=redhat
+  NAME="(Tikanga)"
+
+  if test -f /etc/$DIST-release
+  then
+    { echo "$as_me:$LINENO: checking /etc/$DIST-release for $NAME" >&5
+echo $ECHO_N "checking /etc/$DIST-release for $NAME... $ECHO_C" >&6; }
+    if grep "$NAME" /etc/$DIST-release > /dev/null; then
+      { echo "$as_me:$LINENO: result: found" >&5
+echo "${ECHO_T}found" >&6; }
+      defaultroot="centos-5-$arch"
+    else
+      { echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6; }
+      :
+    fi
+  fi
+
+
 
   DIST=yellowdog
   NAME="(Sirius)"


Index: mach.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mach/EL-5/mach.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mach.spec	12 Sep 2007 18:45:03 -0000	1.12
+++ mach.spec	13 Sep 2007 16:24:13 -0000	1.13
@@ -1,12 +1,13 @@
 Name:           mach
 Version:        0.9.2
-Release:        3%{?dist}
+Release:        3%{?dist}.1
 Summary:        Make a chroot
 
 Group:          Applications/System
 License:        GPLv2+
 URL:            http://thomas.apestaart.org/projects/mach/
 Source:         http://thomas.apestaart.org/download/mach/%{name}-%{version}.tar.bz2
+Patch0:         %{name}-0.9.2-centos4rhel.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
 Requires:	python
@@ -46,6 +47,9 @@
 
 %prep
 %setup -q
+touch -r configure.in configure.in.stamp
+%patch0 -p1
+touch -r configure.in.stamp configure.in
 
 %build
 %configure \
@@ -103,6 +107,9 @@
 %attr(04750,root,mach) %{_sbindir}/mach-helper
 
 %changelog
+* Thu Sep 13 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.9.2-3.1
+- Patch to default to CentOS configs also when built on RHEL.
+
 * Wed Sep 12 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.9.2-3
 - Set default flavour to "epel" for EPEL builds.