rpms/preupgrade/devel releases.txt, NONE, 1.1 .cvsignore, 1.2, 1.3 preupgrade.spec, 1.6, 1.7 sources, 1.5, 1.6 preupgrade-0.9.8-f10beta.patch, 1.1, NONE preupgrade-0.9.8-fix-resume.patch, 1.1, NONE
Will Woods
wwoods at fedoraproject.org
Wed Nov 5 22:22:15 UTC 2008
- Previous message (by thread): rpms/selinux-policy/devel policy-20080710.patch,1.90,1.91
- Next message (by thread): rpms/preupgrade/F-8 .cvsignore, 1.4, 1.5 preupgrade.spec, 1.7, 1.8 sources, 1.5, 1.6 preupgrade-0.9.8-f10beta.patch, 1.1, NONE preupgrade-0.9.8-fix-resume.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: wwoods
Update of /cvs/pkgs/rpms/preupgrade/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6741
Modified Files:
.cvsignore preupgrade.spec sources
Added Files:
releases.txt
Removed Files:
preupgrade-0.9.8-f10beta.patch
preupgrade-0.9.8-fix-resume.patch
Log Message:
0.9.9-1
--- NEW FILE releases.txt ---
# releases.list - a list of available Fedora releases.
#
# Format is as follows:
#
#[Release Name]
# - Header for this release. Typically: [Fedora X (Codename)]
#version=FLOAT
# - Required. Version number for this release.
#stable=BOOL
# - Optional. Marks a release as stable/final. Defaults to false.
#preupgrade-ok=BOOL
# - Optional. Marks a release as usable with preupgrade. Defaults to false.
#eol-date=YYYYMMDD
# - Optional. Gives the date on which the release stops getting updates.
#mirrorlist=URL
# - Mirrorlist URL for this release.
#baseurl=URL
# - Single URL for this release.
#installmirrorlist=URL
# - Mirrorlist for the *installable tree* for this release
# (i.e. this address needs an images/ dir and .treeinfo)
#installurl=URL
# - Single URL for the installable tree.
#
# One of (mirrorlist or baseurl) is required. If those trees do not contain
# boot images (like Fedora 8's Everything tree) then an installurl or
# installmirrorlist is required.
[Rawhide]
# Rawhide is *always* the newest
stable=False
preupgrade-ok=True
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 10 (Cambridge) Beta]
stable=False
preupgrade-ok=True
version=9.92
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?path=pub/fedora/linux/releases/test/10-Beta/Fedora/$basearch/os
# 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
[Fedora 8 (Werewolf)]
stable=True
version=8
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-8&arch=$basearch
installmirrorlist=http://mirrors.fedoraproject.org/mirrorlist?path=pub/fedora/linux/releases/8/Fedora/$basearch/os
[Fedora 7 (Moonshine)]
stable=True
version=7
eol-date=20080613
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-7&arch=$basearch
installmirrorlist=http://mirrors.fedoraproject.org/mirrorlist?path=pub/fedora/linux/releases/7/Fedora/$basearch/os
# vim: syntax=dosini
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/preupgrade/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 18 Sep 2008 21:25:05 -0000 1.2
+++ .cvsignore 5 Nov 2008 22:21:44 -0000 1.3
@@ -1 +1 @@
-preupgrade-0.9.8.tar.gz
+preupgrade-0.9.9.tar.gz
Index: preupgrade.spec
===================================================================
RCS file: /cvs/pkgs/rpms/preupgrade/devel/preupgrade.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- preupgrade.spec 2 Oct 2008 22:52:30 -0000 1.6
+++ preupgrade.spec 5 Nov 2008 22:21:44 -0000 1.7
@@ -1,13 +1,12 @@
%{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
Summary: Preresolves dependencies and prepares a system for an upgrade
Name: preupgrade
-Version: 0.9.8
-Release: 2%{?dist}
+Version: 0.9.9
+Release: 1%{?dist}
License: GPLv2+
Group: System Environment/Base
Source: https://fedorahosted.org/releases/p/r/preupgrade/%{name}-%{version}.tar.gz
-Patch1: preupgrade-0.9.8-fix-resume.patch
-Patch2: preupgrade-0.9.8-f10beta.patch
+Source1: http://mirrors.fedoraproject.org/releases.txt
URL: https://fedorahosted.org/preupgrade/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -21,7 +20,8 @@
# 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
-Requires: yum-metadata-parser, yum >= 3.2.18
+# yum 3.2.19 is needed for setup_locale(), which fixes some i18n tracebacks
+Requires: yum-metadata-parser, yum >= 3.2.19
Requires: usermode
Requires: e2fsprogs
Requires(post): mkinitrd
@@ -33,8 +33,6 @@
%prep
%setup -q
-%patch1 -p1 -b .fix-resume
-%patch2 -p1 -b .f10beta
%build
# no op
@@ -45,18 +43,18 @@
mkdir -p $RPM_BUILD_ROOT/%{_bindir}
ln -s consolehelper $RPM_BUILD_ROOT/%{_bindir}/%{name}
ln -s consolehelper $RPM_BUILD_ROOT/%{_bindir}/%{name}-cli
+# NOTE: we ship this *only* for PackageKit - it is ignored by preupgrade!
+# preupgrade itself pulls data from {$PWD,$PWD/data}/releases.txt or
+# http://mirrors.fedoraproject.org/releases.txt
+install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/usr/share/preupgrade/releases.list
%clean
rm -rf $RPM_BUILD_ROOT
-%post
-/sbin/grubby --remove-kernel=/boot/upgrade/vmlinuz
-%{__rm} -rf /boot/upgrade
-
%files
%defattr(-, root, root)
%dir %{_datadir}/%{name}
-%doc ChangeLog README COPYING
+%doc ChangeLog README COPYING data/releases.txt
%config(noreplace) %{_sysconfdir}/pam.d/*
%config(noreplace) %{_sysconfdir}/security/console.apps/*
%{_datadir}/%{name}/*
@@ -67,6 +65,15 @@
%{python_sitelib}/%{name}
%changelog
+* Mon Nov 3 2008 Will Woods <wwoods at redhat.com> - 0.9.9-1
+- Fetch release data from http://mirrors.fedoraproject.org/releases.txt
+- Recognize new metadata filenames
+- Generate kickstart for all installs
+- Automatically upgrade bootloader config during upgrade
+- preupgrade-cli: Add --vnc for headless remote installs
+- preupgrade-cli: Properly set locale so we don't crash on non-en_US
+- preupgrade-cli: Fix --help
+
* Thu Oct 2 2008 Will Woods <wwoods at redhat.com> - 0.9.8-2
- Clear cache after user decides not to resume an old run
- Add Fedora 10 Beta to releases.list
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/preupgrade/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 18 Sep 2008 21:25:05 -0000 1.5
+++ sources 5 Nov 2008 22:21:44 -0000 1.6
@@ -1 +1 @@
-b6eb699b3a55b46fa98836086ad96880 preupgrade-0.9.8.tar.gz
+cd7234c8073b2cd702181f4ea30a361e preupgrade-0.9.9.tar.gz
--- preupgrade-0.9.8-f10beta.patch DELETED ---
--- preupgrade-0.9.8-fix-resume.patch DELETED ---
- Previous message (by thread): rpms/selinux-policy/devel policy-20080710.patch,1.90,1.91
- Next message (by thread): rpms/preupgrade/F-8 .cvsignore, 1.4, 1.5 preupgrade.spec, 1.7, 1.8 sources, 1.5, 1.6 preupgrade-0.9.8-f10beta.patch, 1.1, NONE preupgrade-0.9.8-fix-resume.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list