[NetworkManager/f15/master] Fix trigger to enable the systemd service for upgrades

Christopher Aillon caillon at fedoraproject.org
Mon Mar 28 20:35:21 UTC 2011


commit 01f64eecdc0c37d5a31dc79501ba8049db40d778
Author: Christopher Aillon <caillon at redhat.com>
Date:   Mon Mar 28 13:33:01 2011 -0700

    Fix trigger to enable the systemd service for upgrades
    
    triggerin gets run on _install_ of a package, so would never get run.
    Change it to be triggerun so it gets triggered when the older package
    (from which we're upgrading) gets uninstalled.
    
    Additionally, the NM version in F-14 has since been updated to a newer
    version than was in the trigger, so update the trigger to a version
    that will never be added to F-14.
    
    https://bugzilla.redhat.com/show_bug.cgi?id=678553

 NetworkManager.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/NetworkManager.spec b/NetworkManager.spec
index 98b1976..2521956 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -20,7 +20,7 @@ Name: NetworkManager
 Summary: Network connection manager and user applications
 Epoch: 1
 Version: 0.8.997
-Release: 5%{snapshot}%{?dist}
+Release: 6%{snapshot}%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -296,7 +296,7 @@ if [ $1 -ge 1 ] ; then
         /bin/systemctl daemon-reload >/dev/null 2>&1 || :
 fi
 
-%triggerin -- NetworkManager < 1:0.8.1-5
+%triggerun -- NetworkManager < 1:0.8.990
 if /sbin/chkconfig NetworkManager ; then
         /bin/systemctl enable NetworkManager.service >/dev/null 2>&1 || :
 fi
@@ -441,6 +441,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/gtk-doc/html/libnm-util/*
 
 %changelog
+* Mon Mar 28 2011 Christopher Aillon <caillon at redhat.com> - 0.8.997-6.git20110328
+- Fix trigger to enable the systemd service for upgrades (rh #678553)
+
 * Mon Mar 28 2011 Dan Williams <dcbw at redhat.com> - 0.8.997-5.git20110328
 - core: fix connection deactivation on the compat interface
 - core: give default wired connections a more friendly name


More information about the scm-commits mailing list