From 92553e05d4d254076fd3e557ec3b676e23f149bd Mon Sep 17 00:00:00 2001
From: Christopher Edward Lumens <clumens@fedoraproject.org>
Date: Wed, 29 Jul 2009 19:40:17 +0000
Subject: [PATCH] New version.

---
 .cvsignore    |  1 +
 anaconda.spec | 35 ++++++++++++++++++++++++++---------
 sources       |  2 +-
 3 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 2d9122b..1034505 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
 anaconda-12.5.tar.bz2
+anaconda-12.6.tar.bz2
diff --git a/anaconda.spec b/anaconda.spec
index c03bdef..cec353f 100644
--- a/anaconda.spec
+++ b/anaconda.spec
@@ -3,8 +3,8 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 12.5
-Release: 2%{?dist}
+Version: 12.6
+Release: 1%{?dist}
 License: GPLv2+
 Group:   Applications/System
 URL:     http://fedoraproject.org/wiki/Anaconda
@@ -30,7 +30,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %define rpmpythonver 4.2-0.61
 %define slangver 2.0.6-2
 %define yumver 2.9.2
-%define rhplver 0.170
 %define partedver 1.8.1
 %define pypartedver 2.0.0
 %define syscfgdatever 1.9.0
@@ -67,7 +66,6 @@ BuildRequires: popt-devel
 BuildRequires: pykickstart >= %{pykickstartver}
 BuildRequires: python-devel
 BuildRequires: python-urlgrabber
-BuildRequires: rhpl
 BuildRequires: rpm-python >= %{rpmpythonver}
 BuildRequires: slang-devel >= %{slangver}
 BuildRequires: xmlto
@@ -84,7 +82,6 @@ BuildRequires: iscsi-initiator-utils-devel >= %{iscsiver}
 Requires: policycoreutils
 Requires: rpm-python >= %{rpmpythonver}
 Requires: comps-extras
-Requires: rhpl >= %{rhplver}
 Requires: parted >= %{partedver}
 Requires: pyparted >= %{pypartedver}
 Requires: yum >= %{yumver}
@@ -115,7 +112,7 @@ Requires: mdadm
 Requires: lvm2
 Requires: util-linux-ng >= 2.15.1
 %ifnarch s390 s390x ppc64
-Requires: system-config-keyboard
+Requires: system-config-keyboard >= 1.3.0
 %endif
 Requires: hal, dbus-python
 Requires: cracklib-python
@@ -186,7 +183,6 @@ update-desktop-database &> /dev/null || :
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc COPYING
-%doc ChangeLog
 %doc docs/command-line.txt
 %doc docs/install-methods.txt
 %doc docs/kickstart-docs.txt
@@ -212,8 +208,29 @@ update-desktop-database &> /dev/null || :
 %endif
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 12.5-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Wed Jul 29 2009 Chris Lumens <clumens@redhat.com> - 12.6-1
+- Fix CDLABEL substitution in syslinux.cfg for x86 boot.iso (katzj)
+- And finish off the removal of rhpl (katzj)
+- Use keyboard bits from system-config-keyboard now (katzj)
+- Use python-meh instead of our own exception handling now (clumens)
+- NM no longer exposes information through HAL (#514501). (clumens)
+- Put mkdir into /sbin on the initrd, too. (clumens)
+- Make sure controlunits.sh is installed to initrd on s390 (dcantrell)
+- Remove ChangeLog (#512502) (dcantrell)
+- Add s390utils-cmsfs in upd-instroot for s390 (dcantrell)
+- Make sure s390 gets /lib/ld64.so.1 (dcantrell)
+- Skip writeDisabledNetInfo() when loader starts on s390 (dcantrell)
+- Fix part --onpart= to print the device name instead of the __str__.
+  (clumens)
+- Just pull in all python modules for stage2 (katzj)
+- Trim PACKAGES list in upd-instroot. (dcantrell)
+- Update linuxrc.s390 and friends to reflect review comments. (maier)
+- Log non-upgradable upgrade candidate roots. (rvykydal)
+- unmountFilesystems -> umountFilesystems (#510970). (clumens)
+- Disable devel repos on release (#503798) (katzj)
+- Work around problems with live installs and dpi other than 96 (#506512)
+  (katzj)
+- Fix obvious typo in font name (katzj)
 
 * Wed Jul 22 2009 David Cantrell <dcantrell@redhat.com> - 12.5-1
 - New build because koji hates me.
diff --git a/sources b/sources
index d70e590..663b1a4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-daaf091cb9eda754deb90ad9196f0730  anaconda-12.5.tar.bz2
+3f9d1f4802ad88ff69deae6879854b1b  anaconda-12.6.tar.bz2