From 08455a2c05eb574f2923c7f1b3b1ef1dcd549440 Mon Sep 17 00:00:00 2001 From: Christopher Edward Lumens Date: Sep 27 2007 20:26:52 +0000 Subject: Rebuild pykickstart-1.13 for F7. --- diff --git a/.cvsignore b/.cvsignore index e39550a..b517663 100644 --- a/.cvsignore +++ b/.cvsignore @@ -18,3 +18,4 @@ pykickstart-0.100.tar.gz pykickstart-1.0.tar.gz pykickstart-1.1.tar.gz pykickstart-1.1.1.tar.gz +pykickstart-1.13.tar.gz diff --git a/pykickstart-version.patch b/pykickstart-version.patch new file mode 100644 index 0000000..c952276 --- /dev/null +++ b/pykickstart-version.patch @@ -0,0 +1,54 @@ +diff -ruN pykickstart-1.13.orig/pykickstart/version.py pykickstart-1.13/pykickstart/version.py +--- pykickstart-1.13.orig/pykickstart/version.py 2007-09-04 12:04:48.000000000 -0400 ++++ pykickstart-1.13/pykickstart/version.py 2007-09-27 16:24:45.000000000 -0400 +@@ -52,11 +52,11 @@ + FC5 = 3000 + FC6 = 4000 + RHEL5 = 4100 +-F7 = 5000 ++F7 = 5000 + F8 = 6000 + + # This always points at the latest version and is the default. +-DEVEL = F8 ++DEVEL = F7 + + """A one-to-one mapping from string representations to version numbers.""" + versionMap = { +diff -ruN pykickstart-1.13.orig/pykickstart.spec pykickstart-1.13/pykickstart.spec +--- pykickstart-1.13.orig/pykickstart.spec 2007-09-12 17:38:43.000000000 -0400 ++++ pykickstart-1.13/pykickstart.spec 2007-09-27 16:24:54.000000000 -0400 +@@ -4,12 +4,14 @@ + Name: pykickstart + Url: http://fedoraproject.org/wiki/pykickstart + Version: 1.13 +-Release: 1%{?dist} ++Release: 2%{?dist} + # This is a Red Hat maintained package which is specific to + # our distribution. Thus the source is only available from + # within this srpm. + Source0: %{name}-%{version}.tar.gz + ++Patch0: %{name}-version.patch ++ + License: GPLv2 + Group: System Environment/Libraries + BuildArch: noarch +@@ -23,6 +25,7 @@ + + %prep + %setup -q ++%patch0 -p1 + make + + %build +@@ -43,6 +46,9 @@ + %{_bindir}/ksvalidator + + %changelog ++* Thu Sep 27 2007 Chris Lumens 1.13-2 ++- Rebuild pykickstart-1.13 for F7, keeping F7 as the default syntax version. ++ + * Wed Sep 12 2007 Chris Lumens 1.13-1 + - Add a function to convert URL method strings into repo objects + (jkeating). diff --git a/pykickstart.spec b/pykickstart.spec index aa3ef2a..121e449 100644 --- a/pykickstart.spec +++ b/pykickstart.spec @@ -1,17 +1,23 @@ -%{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Summary: A python library for manipulating kickstart files Name: pykickstart Url: http://fedoraproject.org/wiki/pykickstart -Version: 1.1.1 -Release: 1%{?dist} +Version: 1.13 +Release: 2%{?dist} +# This is a Red Hat maintained package which is specific to +# our distribution. Thus the source is only available from +# within this srpm. Source0: %{name}-%{version}.tar.gz -License: GPL + +Patch0: %{name}-version.patch + +License: GPLv2 Group: System Environment/Libraries BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel, gettext -Requires: python, python-urlgrabber +Requires: python, python-urlgrabber, rhpl %description The pykickstart package is a python library for manipulating kickstart @@ -19,6 +25,7 @@ files. %prep %setup -q +%patch0 -p1 make %build @@ -34,14 +41,74 @@ rm -rf %{buildroot} %files -f %{name}.lang %defattr(-,root,root,-) %doc README ChangeLog COPYING docs/programmers-guide +%doc docs/kickstart-docs.txt %{python_sitelib}/pykickstart %{_bindir}/ksvalidator %changelog -* Thu Jun 07 2007 Chris Lumens - 1.1.1-1 -- Fix harddrive install method error checking (#242492). +* Thu Sep 27 2007 Chris Lumens 1.13-2 +- Rebuild pykickstart-1.13 for F7, keeping F7 as the default syntax version. + +* Wed Sep 12 2007 Chris Lumens 1.13-1 +- Add a function to convert URL method strings into repo objects + (jkeating). +- Writer formatting fixes. +- Add kickstart documentation from the Fedora Wiki. + +* Tue Sep 04 2007 Chris Lumens 1.12-1 +- Fix lots of problems in processing the bootloader, device, network, and + raid commands. +- Add %end when writing out scripts and packages. +- Add a makefile target to run pychecker to cut down on errors in + releases. + +* Mon Sep 3 2007 Jeremy Katz - 1.11-1 +- fix a few tracebacks + +* Fri Aug 31 2007 Chris Lumens 1.10-1 +- Add network --ipv6=. + +* Fri Aug 24 2007 Chris Lumens 1.9-1 +- Add support for the %end directive to be placed at the end of scripts + and packages sections. Deprecate old syntax. +- Clean up after ksvalidator if pykickstart issues a traceback. +- Add support for repo --priority --includepkgs --excludepkgs. +- Fix newline at end of reboot --eject output (#253562). + +* Mon Aug 13 2007 Chris Lumens 1.8-1 +- Fix type checking of string values. + +* Thu Aug 09 2007 Chris Lumens 1.7-1 +- Clarify license in spec file and all source files. +- Check string values to options to make sure they're not other options + (#251318). + +* Thu Aug 02 2007 Chris Lumens 1.6-1 +- Fix a couple tracebacks in ksvalidator. +- Change --class to --dhcpclass (#248912). + +* Thu Jul 19 2007 Chris Lumens 1.5-2 +- Require rhpl (#248953). + +* Tue Jul 17 2007 Chris Lumens 1.5-1 +- Fix traceback when calling preprocessKickstart. + +* Tue Jul 17 2007 Chris Lumens 1.4-1 +- Add methods to handle the %ksappend directive. +- Fix ignoredisk --disks. + +* Wed Jul 11 2007 Chris Lumens - 1.3-1 +- Add support for ignoredisk --only-use. +- Fix traceback in raid command printing method (#246709). + +* Fri Jun 08 2007 Chris Lumens - 1.2-2 +- Fix package review problems (#226334). + +* Mon Jun 04 2007 Chris Lumens - 1.2-1 +- Fix harddrive install method error checking (#232492). - Set authentication information from the input line to preserve quoting (#241657). +- Allow included files to be given by URL. - Fix typo in user --iscrypted option. * Mon May 14 2007 Chris Lumens - 1.1-1 diff --git a/sources b/sources index 849fb8a..09a318a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3b6922b6cee85dd615ce4ce256538d05 pykickstart-1.1.1.tar.gz +806c4a9d946ef0e68ba58a7b64fa0c15 pykickstart-1.13.tar.gz