[fedup] spec fixups for f18+

[Will Woods]

commit 93aa9d63c54e751879b599ae53a87583fb43208a
Author: Will Woods <wwoods at redhat.com>
Date:   Fri Jun 7 13:42:08 2013 -0400

    spec fixups for f18+
    
    Update version number so we don't break upgrade path, etc.

 fedup.spec |   23 +++++++++++------------
 1 files changed, 11 insertions(+), 12 deletions(-)
---
diff --git a/fedup.spec b/fedup.spec
index 7f70a28..90f2b5e 100644
--- a/fedup.spec
+++ b/fedup.spec
@@ -1,20 +1,15 @@
 Name:           fedup
 Version:        0.7.3
-Release:        4%{?dist}
+Release:        6%{?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
 # Fix upgrade getting stuck for F18->F19 (bug #954371)
-Source2:        system-upgrade.target
+Source1:        system-upgrade.target
 
-# Require updates to various packages where necessary to fix bugs.
-# Bug #910326
-Requires:       systemd >= systemd-44-23.fc17
 Requires:       grubby
 
 BuildRequires:  python2-devel
@@ -27,6 +22,7 @@ BuildArch:      noarch
 Obsoletes:      preupgrade
 %endif
 
+
 %description
 fedup is the Fedora Upgrade tool.
 
@@ -43,11 +39,10 @@ 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
+# empty updates dir
 mkdir -p $RPM_BUILD_ROOT/etc/fedup/update.img.d
-install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/etc/fedup/update.img.d
 # Fix for #954371
-install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT/%{_unitdir}
+install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/%{_unitdir}
 
 
 
@@ -70,8 +65,8 @@ install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT/%{_unitdir}
 %dir /etc/fedup
 # empty updates dir
 %dir /etc/fedup/update.img.d
-# any updates
-/etc/fedup/update.img.d/*
+# any updates?
+#/etc/fedup/update.img.d/*
 
 #TODO - finish and package gtk-based GUI
 #files gtk
@@ -79,6 +74,10 @@ install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT/%{_unitdir}
 #{_datadir}/fedup/ui
 
 %changelog
+* Fri Jun 7 2013 Will Woods <wwoods at redhat.com> 0.7.3-6
+- Drop F17 bug workaround
+- Update version number for upgrade path magic
+
 * Tue Apr 30 2013 Will Woods <wwoods at redhat.com> 0.7.3-4
 - Dependency fix: can't Obsolete preupgrade until F19 :/