Update systemd unit files (rh #948433) (rh #787314)

This commit is contained in:
Dan Williams 2013-05-15 09:56:29 -05:00
parent 4aa8a04bae
commit 7cf89f50f6
3 changed files with 17 additions and 19 deletions

1
.gitignore vendored
View File

@ -289,3 +289,4 @@ network-manager-applet-0.8.1.tar.bz2
/NetworkManager-0.9.7.0.git20121211.tar.bz2 /NetworkManager-0.9.7.0.git20121211.tar.bz2
/NetworkManager-0.9.8.0.tar.bz2 /NetworkManager-0.9.8.0.tar.bz2
/NetworkManager-0.9.9.0.git20130514.tar.bz2 /NetworkManager-0.9.9.0.git20130514.tar.bz2
/NetworkManager-0.9.9.0.git20130515.tar.bz2

View File

@ -6,7 +6,7 @@
%define libnl3_version 3.2.7 %define libnl3_version 3.2.7
%define ppp_version 2.4.5 %define ppp_version 2.4.5
%define snapshot .git20130514 %define snapshot .git20130515
%define realversion 0.9.9.0 %define realversion 0.9.9.0
%global regen_docs 0 %global regen_docs 0
@ -23,7 +23,7 @@ Name: NetworkManager
Summary: Network connection manager and user applications Summary: Network connection manager and user applications
Epoch: 1 Epoch: 1
Version: 0.9.9.0 Version: 0.9.9.0
Release: 1%{snapshot}%{?dist} Release: 2%{snapshot}%{?dist}
Group: System Environment/Base Group: System Environment/Base
License: GPLv2+ License: GPLv2+
URL: http://www.gnome.org/projects/NetworkManager/ URL: http://www.gnome.org/projects/NetworkManager/
@ -37,9 +37,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires(post): chkconfig Requires(post): chkconfig
Requires(preun): chkconfig Requires(preun): chkconfig
Requires(post): systemd-sysv Requires(post): systemd-sysv
Requires(post): /bin/systemctl Requires(post): systemd
Requires(preun): /bin/systemctl Requires(preun): systemd
Requires(postun): /bin/systemctl Requires(postun): systemd
Requires: dbus >= %{dbus_version} Requires: dbus >= %{dbus_version}
Requires: dbus-glib >= %{dbus_glib_version} Requires: dbus-glib >= %{dbus_glib_version}
@ -91,7 +91,7 @@ BuildRequires: iptables
%ifnarch s390 s390x %ifnarch s390 s390x
BuildRequires: wimax-devel BuildRequires: wimax-devel
%endif %endif
BuildRequires: systemd systemd-devel BuildRequires: systemd >= 200-3 systemd-devel
%if 0%{?fedora} && 0%{?fedora} < 17 %if 0%{?fedora} && 0%{?fedora} < 17
# systemd.pc is in systemd-units for F16 and below # systemd.pc is in systemd-units for F16 and below
BuildRequires: systemd-units BuildRequires: systemd-units
@ -230,18 +230,15 @@ install -m 0755 test/.libs/nm-online %{buildroot}/%{_bindir}
%{__cp} ORIG-docs/libnm-util/html/* $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/libnm-util/ %{__cp} ORIG-docs/libnm-util/html/* $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/libnm-util/
%endif %endif
mkdir -p $RPM_BUILD_ROOT%{systemd_dir}/remote-fs-pre.target.wants mkdir -p $RPM_BUILD_ROOT%{systemd_dir}/network-online.target.wants
ln -s ../NetworkManager-wait-online.service $RPM_BUILD_ROOT%{systemd_dir}/remote-fs-pre.target.wants ln -s ../NetworkManager-wait-online.service $RPM_BUILD_ROOT%{systemd_dir}/network-online.target.wants
%clean %clean
%{__rm} -rf $RPM_BUILD_ROOT %{__rm} -rf $RPM_BUILD_ROOT
%post %post
if [ $1 -eq 1 ] ; then %systemd_post NetworkManager.service NetworkManager-wait-online.service NetworkManager-dispatcher.service
# Initial installation
/bin/systemctl enable NetworkManager.service >/dev/null 2>&1 || :
fi
%preun %preun
if [ $1 -eq 0 ]; then if [ $1 -eq 0 ]; then
@ -251,15 +248,10 @@ if [ $1 -eq 0 ]; then
# Don't kill networking entirely just on package remove # Don't kill networking entirely just on package remove
#/bin/systemctl stop NetworkManager.service >/dev/null 2>&1 || : #/bin/systemctl stop NetworkManager.service >/dev/null 2>&1 || :
fi fi
%systemd_preun NetworkManager-wait-online.service NetworkManager-dispatcher.service
%postun %postun
/bin/systemctl daemon-reload >/dev/null 2>&1 || : %systemd_postun
if [ $1 -ge 1 ] ; then
# Package upgrade, not uninstall
# Don't restart networking to prevent hiccups
#/bin/systemctl try-restart NetworkManager.service >/dev/null 2>&1 || :
true
fi
%triggerun -- NetworkManager < 1:0.8.990 %triggerun -- NetworkManager < 1:0.8.990
# Save the current service runlevel info # Save the current service runlevel info
@ -367,6 +359,10 @@ exit 0
%{_datadir}/gtk-doc/html/libnm-util/* %{_datadir}/gtk-doc/html/libnm-util/*
%changelog %changelog
* Wed May 15 2013 Dan Williams <dcbw@redhat.com> - 0.9.9.0-2.git20130515
- Update for systemd network-online.target (rh #787314)
- Add system service for the script dispatcher (rh #948433)
* Tue May 14 2013 Dan Williams <dcbw@redhat.com> - 0.9.9.0-1.git20130514 * Tue May 14 2013 Dan Williams <dcbw@redhat.com> - 0.9.9.0-1.git20130514
- Enable hardened build - Enable hardened build
- Update to 0.9.10 snapshot - Update to 0.9.10 snapshot

View File

@ -1 +1,2 @@
22525d253039df5f3b4f210568102965 NetworkManager-0.9.9.0.git20130514.tar.bz2 22525d253039df5f3b4f210568102965 NetworkManager-0.9.9.0.git20130514.tar.bz2
3e754a7c5629f17d763b28929fe2545d NetworkManager-0.9.9.0.git20130515.tar.bz2