rpms/preupgrade/F-13 .cvsignore, 1.10, 1.11 preupgrade.spec, 1.23, 1.24 releases.txt, 1.3, 1.4 sources, 1.15, 1.16

Wed May 12 14:50:21 UTC 2010

Author: rhughes

Update of /cvs/pkgs/rpms/preupgrade/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv17201

Modified Files:
	.cvsignore preupgrade.spec releases.txt sources 
Log Message:
* Wed May 12 2010 Richard Hughes <richard at hughsie.com> - 1.1.6-1
- New upstream release.
- Generate a valid kickstart when there is no space for the install.img
- Ensure we disable all plugins which could cause issues with downloading
- Translation updates



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/preupgrade/F-13/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11

--- .cvsignore	12 Oct 2009 19:20:16 -0000	1.10
+++ .cvsignore	12 May 2010 14:50:20 -0000	1.11
@@ -1 +1 @@
-preupgrade-1.1.2.tar.bz2
+preupgrade-1.1.6.tar.bz2


Index: preupgrade.spec
===================================================================
RCS file: /cvs/pkgs/rpms/preupgrade/F-13/preupgrade.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- preupgrade.spec	16 Dec 2009 16:32:57 -0000	1.23
+++ preupgrade.spec	12 May 2010 14:50:21 -0000	1.24
@@ -1,39 +1,28 @@
 %{!?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.4
+Version: 1.1.6
 Release: 1%{?dist}
 License: GPLv2+
-Group: System Environment/Base
 Source: https://fedorahosted.org/releases/p/r/preupgrade/%{name}-%{version}.tar.bz2
 Source1: http://mirrors.fedoraproject.org/releases.txt
 URL: https://fedorahosted.org/preupgrade/
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 Requires: python >= 2.1, rpm-python, rpm >= 0:4.1.1
-# preupgrade-gui requires pygtk2 and libglade
-# TODO: split out preupgrade-gtk subpackage that requires this
-# NOTE gtk 2.16.6 changed button behavior for GtkAssistant (gnome bug 589745),
-# and we expect that behavior, so require gtk2 >= 2.16.6
 Requires: pygtk2-libglade, gtk2 >= 2.16.6
-# F10 anaconda provides its special depsolving magic as yum plugins
 Requires: anaconda-yum-plugins
-# yum 3.2.24 fixes some unicode reading issues - see bug 527552
+Requires: python-urlgrabber >= 3.9.1-4
 Requires: yum-metadata-parser, yum >= 3.2.24
 Requires: usermode
-# F10 anaconda expects to be handed a valid yum repo
-# createrepo < 0.9.7 raises IndexError in _dump_base_items with yum >= 3.2.24
-# createrepo < 0.9.7-7 raises some weird errors dealing with sqlite
 Requires: createrepo >= 0.9.7-7
-# blkid moved from e2fsprogs to util-linux-ng in 2.15.1
 %if 0%{?fedora} >= 12
 Requires: util-linux-ng >= 2.15.1
 %else
 Requires: e2fsprogs
 %endif
+BuildRequires: intltool
 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
 Conflicts: yaboot < 1.3.14-8
 
 %description
@@ -48,7 +37,6 @@ and then setting up your system to perfo
 # no op
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 mkdir -p $RPM_BUILD_ROOT/%{_bindir}
 ln -s consolehelper $RPM_BUILD_ROOT/%{_bindir}/%{name}
@@ -58,10 +46,9 @@ ln -s consolehelper $RPM_BUILD_ROOT/%{_b
 # http://mirrors.fedoraproject.org/releases.txt
 install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/usr/share/preupgrade/releases.list
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+%find_lang %name
 
-%files
+%files -f %{name}.lang
 %defattr(-, root, root)
 %dir %{_datadir}/%{name}
 %doc ChangeLog README COPYING data/releases.txt
@@ -75,6 +62,12 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/%{name}
 
 %changelog
+* Wed May 12 2010 Richard Hughes <richard at hughsie.com> - 1.1.6-1
+- New upstream release.
+- Generate a valid kickstart when there is no space for the install.img
+- Ensure we disable all plugins which could cause issues with downloading
+- Translation updates
+
 * Mon Dec 14 2009 Seth Vidal <skvidal at fedoraproject.org> - 1.1.4-1
 - fixes 538118 among others
 


Index: releases.txt
===================================================================
RCS file: /cvs/pkgs/rpms/preupgrade/F-13/releases.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- releases.txt	13 May 2009 22:33:02 -0000	1.3
+++ releases.txt	12 May 2010 14:50:21 -0000	1.4
@@ -36,6 +36,21 @@ version=999
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/development/$basearch/os
 
+[Fedora 13 (Branch)]
+stable=False
+preupgrade-ok=True
+version=13
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-13&arch=$basearch
+installmirrorlist=http://mirrors.fedoraproject.org/mirrorlist?path=pub/fedora/linux/development/13/$basearch/os
+#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/development/13/$basearch/os
+
+[Fedora 12 (Constantine)]
+stable=True
+preupgrade-ok=True
+version=12
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-12&arch=$basearch
+installmirrorlist=http://mirrors.fedoraproject.org/mirrorlist?path=pub/fedora/linux/releases/12/Fedora/$basearch/os
+
 [Fedora 11 (Leonidas)]
 stable=True
 preupgrade-ok=True
@@ -49,14 +64,17 @@ preupgrade-ok=True
 version=10
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-10&arch=$basearch
 installmirrorlist=http://mirrors.fedoraproject.org/mirrorlist?path=pub/fedora/linux/releases/10/Fedora/$basearch/os
+eol-date=20091217
 
 # You can't reliably preupgrade to these.
 # They're only here so we know when they've gone EOL.
+
 [Fedora 9 (Sulphur)]
 stable=True
 version=9
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-9&arch=$basearch
 installmirrorlist=http://mirrors.fedoraproject.org/mirrorlist?path=pub/fedora/linux/releases/9/Fedora/$basearch/os
+eol-date=20090703
 
 [Fedora 8 (Werewolf)]
 stable=True


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/preupgrade/F-13/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	16 Dec 2009 16:32:57 -0000	1.15
+++ sources	12 May 2010 14:50:21 -0000	1.16
@@ -1 +1 @@
-8666b771599edfb1ef54932eab498793  preupgrade-1.1.4.tar.bz2
+ad95afdc72c0310e487b9d69d610ca87  preupgrade-1.1.6.tar.bz2

