rpms/preupgrade/F-10 .cvsignore, 1.9, 1.10 preupgrade.spec, 1.16, 1.17 sources, 1.13, 1.14

[Will Woods]

Author: wwoods

Update of /cvs/pkgs/rpms/preupgrade/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11970

Modified Files:
	.cvsignore preupgrade.spec sources 
Log Message:
1.1.2 with f10-specific spec (no gtk change)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/preupgrade/F-10/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	13 May 2009 22:32:59 -0000	1.9
+++ .cvsignore	20 Oct 2009 20:48:40 -0000	1.10
@@ -1 +1 @@
-preupgrade-1.1.0.tar.bz2
+preupgrade-1.1.2.tar.bz2


Index: preupgrade.spec
===================================================================
RCS file: /cvs/pkgs/rpms/preupgrade/F-10/preupgrade.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- preupgrade.spec	9 Oct 2009 21:10:08 -0000	1.16
+++ preupgrade.spec	20 Oct 2009 20:48:40 -0000	1.17
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 Summary: Prepares a system for an upgrade
 Name: preupgrade
-Version: 1.1.1
-Release: 1%{?dist}
+Version: 1.1.2
+Release: 1.fc10
 License: GPLv2+
 Group: System Environment/Base
 Source: https://fedorahosted.org/releases/p/r/preupgrade/%{name}-%{version}.tar.bz2
@@ -18,9 +18,8 @@ Requires: pygtk2-libglade
 Requires: anaconda-yum-plugins
 # F10 anaconda expects to be handed a valid yum repo
 Requires: createrepo
-# yum 3.2.18 is needed to enable the above plugins at runtime
-# yum 3.2.19 is needed for setup_locale(), which fixes some i18n tracebacks
-Requires: yum-metadata-parser, yum >= 3.2.19
+# yum 3.2.24 fixes some unicode reading issues - see bug 527552
+Requires: yum-metadata-parser, yum >= 3.2.24
 Requires: usermode
 # blkid moved from e2fsprogs to util-linux-ng in 2.15.1
 %if 0%{?fedora} >= 12
@@ -31,15 +30,7 @@ Requires: e2fsprogs
 BuildRequires: desktop-file-utils, python
 # preupgrade's use of long append="..." strings will break older yaboot
 # and thus render ppc systems unbootable - see bug #471321
-%if 0%{?fedora} == 8
-Conflicts: yaboot < 1.3.13-9
-%endif
-%if 0%{?fedora} == 9
-Conflicts: yaboot < 1.3.13-13
-%endif
-%if 0%{?fedora} >= 10
 Conflicts: yaboot < 1.3.14-8
-%endif
 
 %description
 preupgrade prepares your Fedora system for an upgrade to the next version
@@ -80,6 +71,12 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/%{name}
 
 %changelog
+* Mon Oct 12 2009 Will Woods <wwoods at redhat.com> - 1.1.2-1.fc10
+- Proper fix for bug 526208
+
+* Fri Oct  9 2009 Seth Vidal <skvidal at fedoraproject.org> - 1.1.1-2
+- require yum 3.2.24
+
 * Fri Oct 09 2009 Will Woods <wwoods at redhat.com> - 1.1.1-1
 - Fix UI hang on upgrades from F11 (bug 526208)
 - Fix unhandled traceback in preupgrade.dev (bug 504826)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/preupgrade/F-10/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	9 Oct 2009 21:10:08 -0000	1.13
+++ sources	20 Oct 2009 20:48:40 -0000	1.14
@@ -1 +1 @@
-f96a2814603f78f623397a5548245f9c  preupgrade-1.1.1.tar.bz2
+f5fc1b7b6c8ef78360adc250e6204471  preupgrade-1.1.2.tar.bz2