[rootfs-resize/f18: 2/2] Removed Fedora release conditionals

Chris Tyler ctyler at fedoraproject.org
Tue Jun 18 15:48:21 UTC 2013


commit c572338e0d41a13501fa65f9bb6c66494ac53460
Author: Chris Tyler <chris at tylers.info>
Date:   Tue Jun 18 11:47:03 2013 -0400

    Removed Fedora release conditionals

 rootfs-resize.spec |   37 ++++---------------------------------
 1 files changed, 4 insertions(+), 33 deletions(-)
---
diff --git a/rootfs-resize.spec b/rootfs-resize.spec
index 2cf1ac2..480beaf 100644
--- a/rootfs-resize.spec
+++ b/rootfs-resize.spec
@@ -3,7 +3,7 @@
 
 Name:           rootfs-resize
 Version:        2.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Root partition re-sizing service (typically for SD cards)
 
 License:        GPLv2+
@@ -17,17 +17,10 @@ Source0:        http://github.com/ctyler/rootfs-resize/tarball/%{commit_long}
 # appears that ExclusiveArch cannot be used with BuildArch.
 BuildArch:      noarch
 
-%if 0%{fedora} > 17
 Requires(post): systemd
 Requires(preun): systemd
 Requires(postun): systemd
 BuildRequires: systemd
-%else
-Requires(post): systemd-units
-Requires(preun): systemd-units
-Requires(postun): systemd-units
-BuildRequires: systemd-units
-%endif
 
 Requires:       python pyparted python-psutil e2fsprogs systemd util-linux
 
@@ -56,8 +49,6 @@ cp -p %{name} %{buildroot}/%{_sbindir}
 %attr(0644,root,root) %{_unitdir}/*
 %attr(0755,root,root) %{_sbindir}/*
 
-%if 0%{fedora} > 17
-
 %post
 %systemd_post rootfs-resize.service
 
@@ -67,31 +58,11 @@ cp -p %{name} %{buildroot}/%{_sbindir}
 %postun
 %systemd_postun_with_restart apache-httpd.service 
 
-%else
-
-%post
-if [ $1 -eq 1 ] ; then
-    # Initial installation
-    /bin/systemctl enable %{name}.service >/dev/null 2>&1 || :
-fi
-
-%preun
-if [ $1 -eq 0 ] ; then
-    # Package removal, not upgrade
-    /bin/systemctl --no-reload disable %{name}.service > /dev/null 2>&1 || :
-    /bin/systemctl stop %{name}.service > /dev/null 2>&1 || :
-fi
-
-%postun
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-if [ $1 -ge 1 ] ; then
-    # Package upgrade, not uninstall
-    /bin/systemctl try-restart %{name}.service >/dev/null 2>&1 || :
-fi
-
-%endif
 
 %changelog
+* Tue Jun 18 2013 Chris Tyler <chris at tylers.info> - 2.0-4
+- Removed fedora conditionals
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 


More information about the scm-commits mailing list