[fedup] fedup 0.7.3

Will Woods wwoods at fedoraproject.org
Fri Mar 15 22:32:03 UTC 2013


commit 47a4c7f6e14fd3f09330141410c1a72784d54c99
Author: Will Woods <wwoods at redhat.com>
Date:   Fri Mar 15 18:14:19 2013 -0400

    fedup 0.7.3

 fedup.spec |   40 ++++++++++++++++++++++++++++++++++------
 sources    |    2 +-
 2 files changed, 35 insertions(+), 7 deletions(-)
---
diff --git a/fedup.spec b/fedup.spec
index 6731ba8..8137de0 100644
--- a/fedup.spec
+++ b/fedup.spec
@@ -1,17 +1,26 @@
 Name:           fedup
 Version:        0.7.3
-Release:        0.git20130128%{?dist}
+Release:        1%{?dist}
 Summary:        The Fedora Upgrade tool
 
 License:        GPLv2+
 URL:            https://github.com/wgwoods/fedup
 Source0:        https://github.com/downloads/wgwoods/fedup/%{name}-%{version}.tar.xz
 
+# Apply this as an update to fix hang with encrypted /home (bug #896023)
+Source1:        bug896023.img
+
+# Require updates to various packages where necessary to fix bugs.
+# Bug #910326
+Requires:       systemd >= systemd-44-23.fc17
+Requires:       grubby
+
 BuildRequires:  python2-devel
 BuildRequires:  systemd-devel
-Requires:       systemd grubby
+BuildRequires:  asciidoc
 BuildArch:      noarch
 
+
 # TODO: uncomment this once we figure out why PackageKit requires preupgrade..
 #Obsoletes:      preupgrade
 #Provides:       preupgrade
@@ -24,13 +33,17 @@ fedup is the Fedora Upgrade tool.
 %setup -q
 
 %build
-%{__python} setup.py build
+make PYTHON=%{__python}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
-make install-systemd DESTDIR=$RPM_BUILD_ROOT
+make install PYTHON=%{__python} DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir}
+# backwards compatibility symlinks, wheee
 ln -sf fedup $RPM_BUILD_ROOT/%{_bindir}/fedup-cli
+ln -sf fedup.8 $RPM_BUILD_ROOT/%{_mandir}/man8/fedup-cli.8
+# updates dir
+mkdir -p $RPM_BUILD_ROOT/etc/fedup/update.img.d
+install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/etc/fedup/update.img.d
 
 
 
@@ -47,6 +60,14 @@ ln -sf fedup $RPM_BUILD_ROOT/%{_bindir}/fedup-cli
 # binaries
 %{_bindir}/fedup
 %{_bindir}/fedup-cli
+# man pages
+%{_mandir}/man*/*
+# empty config dir
+%dir /etc/fedup
+# empty updates dir
+%dir /etc/fedup/update.img.d
+# any updates
+/etc/fedup/update.img.d/*
 
 #TODO - finish and package gtk-based GUI
 #files gtk
@@ -54,8 +75,12 @@ ln -sf fedup $RPM_BUILD_ROOT/%{_bindir}/fedup-cli
 #{_datadir}/fedup/ui
 
 %changelog
-* Mon Jan 28 2013 Will Woods <wwoods at redhat.com> 0.7.3-0
+* Fri Mar 15 2013 Will Woods <wwoods at redhat.com> 0.7.3-1
+- Fix hang starting upgrade with encrypted /home (#896023)
+
+* Fri Mar 15 2013 Will Woods <wwoods at redhat.com> 0.7.3-0
 - Write debuglog by default (/var/log/fedup.log)
+- Add support for applying updates to upgrade.img
 - Use proxy settings from yum.conf (#892994)
 - Fix "NameError: global name 'po' is not defined" (#895576)
 - Clearer error on already-upgraded systems (#895967)
@@ -63,6 +88,9 @@ ln -sf fedup $RPM_BUILD_ROOT/%{_bindir}/fedup-cli
 - Fix "OSError: [Errno 2]..." when `selinuxenabled` is not in PATH (#896721)
 - Fix tracebacks on bad arguments to --iso (#896440, #895665)
 - Fix traceback if grubby is missing (#896194)
+- Require newer systemd to fix hang on not-updated systems (#910326)
+- Fix hang starting upgrade on systems with /dev/md* (#895805)
+- Better error messages if you're out of disk space (#896144)
 
 * Thu Dec 06 2012 Will Woods <wwoods at redhat.com> 0.7.2-1
 - Fix grubby traceback on EFI systems (#884696)
diff --git a/sources b/sources
index a721e5b..fdd14e2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fae4a41ef6cc2ff1ee38e606f598d6e0  fedup-0.7.3.tar.xz
+2e52d854b7230b97809ec021c7440a2a  fedup-0.7.3.tar.xz


More information about the scm-commits mailing list