From b038f9abdfe02ee91124a2d0d6e9830715151156 Mon Sep 17 00:00:00 2001 From: Miroslav Suchý Date: Jan 02 2012 15:00:04 +0000 Subject: Rebase to rhn-custom-info-5.4.13-1.fc16 in rawhide. --- diff --git a/.gitignore b/.gitignore index 95afeff..fcba0bf 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /rhn-custom-info-5.4.5.tar.gz /rhn-custom-info-5.4.7.tar.gz /rhn-custom-info-5.4.11.tar.gz +/rhn-custom-info-5.4.13.tar.gz diff --git a/rhn-custom-info.spec b/rhn-custom-info.spec index 7d2e781..2adfac3 100644 --- a/rhn-custom-info.spec +++ b/rhn-custom-info.spec @@ -4,25 +4,25 @@ Group: Applications/System License: GPLv2 and Python Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz URL: https://fedorahosted.org/spacewalk -Version: 5.4.11 +Version: 5.4.13 Release: 1%{?dist} BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildArch: noarch BuildRequires: python-devel -%if 0%{?fedora} == 13 -Requires: python-abi = 2.6 -%endif -%if 0%{?rhel} && 0%{?rhel} <= 4 -BuildRequires: python -Requires: python-abi = %(%{__python} -c "import sys; print sys.version[:3]") -%endif Requires: rhnlib %if 0%{?rhel} >= 5 || 0%{?fedora} >= 1 Requires: yum-rhn-plugin %else +# rpm do not support elif +%if 0%{?suse_version} +Requires: zypp-plugin-spacewalk +# provide rhn directories for filelist check +BuildRequires: rhn-client-tools +%else Requires: up2date %endif +%endif %description Allows for the setting and listing of custom key/value pairs for @@ -53,6 +53,15 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man8/rhn-custom-info.* %changelog +* Fri Jul 22 2011 Jan Pazdziora 5.4.13-1 +- We only support version 5 and newer of RHEL, removing conditions for old + versions. +- We only support version 14 and newer of Fedora, removing conditions for old + versions. + +* Fri Apr 15 2011 Jan Pazdziora 5.4.12-1 +- build rhn-custom-info on SUSE (mc@suse.de) + * Fri Apr 08 2011 Miroslav Suchý 5.4.11-1 - update copyright years (msuchy@redhat.com) diff --git a/sources b/sources index 3c934d5..1c7a72f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -93fa6fdc5c8fa375ae64a9f1b7415945 rhn-custom-info-5.4.11.tar.gz +ac306fb3df56275c491fdf7318b2285e rhn-custom-info-5.4.13.tar.gz