diff options
| author | Michael DeHaan <mdehaan@redhat.com> | 2008-12-22 14:08:35 -0500 |
|---|---|---|
| committer | Michael DeHaan <mdehaan@redhat.com> | 2008-12-22 14:08:35 -0500 |
| commit | db0d209c33a0d5de14160900451c6ee894c84c8f (patch) | |
| tree | 132a0ef9a6d64e3109ebca8f9336db798a37bbba /cobbler.spec | |
| parent | 015d67af8c7639321a17e59d15badcfdd6e5eb6a (diff) | |
| parent | 9a64f92cf940bf605e59e02fdbc49930dcf5b446 (diff) | |
| download | cobbler-db0d209c33a0d5de14160900451c6ee894c84c8f.tar.gz cobbler-db0d209c33a0d5de14160900451c6ee894c84c8f.tar.xz cobbler-db0d209c33a0d5de14160900451c6ee894c84c8f.zip | |
Merge branch 'master' into devel
Diffstat (limited to 'cobbler.spec')
| -rw-r--r-- | cobbler.spec | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/cobbler.spec b/cobbler.spec index 87f1b2db..5d493d4e 100644 --- a/cobbler.spec +++ b/cobbler.spec @@ -3,7 +3,7 @@ Summary: Boot server configurator Name: cobbler AutoReq: no Version: 1.4.0 -Release: 2%{?dist} +Release: 4%{?dist} Source0: %{name}-%{version}.tar.gz License: GPLv2+ Group: Applications/System @@ -30,8 +30,8 @@ Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig Requires(preun): /sbin/service %if 0%{?fedora} >= 11 || 0%{?rhel} >= 6 -%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")} -Requires: python(abi)=%{pyver} +%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]" || echo 0)} +Requires: python(abi) = %{pyver} %endif %if 0%{?suse_version} < 0 BuildRequires: redhat-rpm-config @@ -285,6 +285,9 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT %changelog +* Fri Dec 19 2008 Michael DeHaan <mdehaan@redhat.com> - 1.4.0-4 +- Fix for rawhide python requirement. + * Fri Dec 19 2008 Michael DeHaan <mdehaan@redhat.com> - 1.4.0-2 - Upstream changes (see CHANGELOG) |