summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormdehaan@mdehaan.rdu.redhat.com <>2006-12-08 11:31:18 -0500
committerJim Meyering <jim@meyering.net>2006-12-08 11:31:18 -0500
commit2a77a81afaad3f3df5fc6a38902feb33ffcadce7 (patch)
treef37d143144e0a5383c4e9955749d05dbdaa47a6b
parent7ff027d8e601f8191c057ed571852baf020d5054 (diff)
downloadcobbler-2a77a81afaad3f3df5fc6a38902feb33ffcadce7.tar.gz
cobbler-2a77a81afaad3f3df5fc6a38902feb33ffcadce7.tar.xz
cobbler-2a77a81afaad3f3df5fc6a38902feb33ffcadce7.zip
Fixed MANIFEST.in so distutils on RHEL3 will allow it to be built there. However the noarch is already force installable
across RHEL3, RHEL4, and FC5-6 without being rebuilt.
-rw-r--r--CHANGELOG2
-rw-r--r--MANIFEST.in1
-rw-r--r--Makefile1
-rw-r--r--koan.spec3
-rwxr-xr-xkoan/koan2
5 files changed, 6 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 84058900..02153acc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,7 +4,7 @@ Detail of software changes that are not packaging related.
These *should* correspond with a bump in the software version. This
wasn't consistant for 0.1.X builds, though it will be in the future.
-* Thr Dec 07 2006 Michael DeHaan <mdehaan@redhat.com> - 0.2.5-1
+* Fri Dec 08 2006 Michael DeHaan <mdehaan@redhat.com> - 0.2.5-1
- Now probes bootloader to determine what bootloader to edit, rather
than using the first installed package.
diff --git a/MANIFEST.in b/MANIFEST.in
index f289acc9..b6ceba8b 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,2 +1,3 @@
include koan.1.gz
include CHANGELOG COPYING NEWS README AUTHORS
+include koan/koan
diff --git a/Makefile b/Makefile
index aece4e86..1bd608e2 100644
--- a/Makefile
+++ b/Makefile
@@ -22,3 +22,4 @@ rpm: clean manpage
--define "_specdir %{_topdir}" \
--define "_sourcedir %{_topdir}" \
-ba koan.spec
+
diff --git a/koan.spec b/koan.spec
index ced3b922..7dbb74ca 100644
--- a/koan.spec
+++ b/koan.spec
@@ -48,8 +48,9 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
%changelog
-* Thu Dec 07 2006 - Michael DeHaan <mdehaan@redhat.com> - 0.2.5-1
+* Fri Dec 08 2006 - Michael DeHaan <mdehaan@redhat.com> - 0.2.5-1
- Upstream changes (see CHANGELOG)
+- tweaked MANIFEST.in to appease rhel3 builds
* Wed Oct 25 2006 - Michael DeHaan <mdehaan@redhat.com> - 0.2.4-1
- Upstream changes (see CHANGELOG)
diff --git a/koan/koan b/koan/koan
index c647d6a4..594e137c 100755
--- a/koan/koan
+++ b/koan/koan
@@ -29,7 +29,7 @@ import sys
# when using koan normally, the RPM will be built for the proper distro
# and this code will be mostly harmless.
-for version in [ "2.3", "2.4", "2.5" ]:
+for version in [ "2.2", "2.3", "2.4", "2.5" ]:
for arch in [ "lib", "lib64" ]:
append = "/usr/%s/python%s/site-packages" % (arch,version)
sys.path.append(append)