File project.diff of Package openstack-nova

--- openstack-nova.changes.orig
+++ openstack-nova.changes
@@ -23,6 +23,11 @@ Thu Mar  1 03:18:27 UTC 2018 -  cloud-de
   * Proper error handling by \_ensure\_resource\_provider
 
 -------------------------------------------------------------------
+Wed Feb 28 13:59:09 UTC 2018 - aplanas@suse.com
+
+- Replace %pre[un], %post[un] sections with systemd macros
+
+-------------------------------------------------------------------
 Wed Feb 28 03:17:45 UTC 2018 -  cloud-devel@suse.de
 
 - Update to version nova-16.1.1.dev3:
--- openstack-nova.spec.orig
+++ openstack-nova.spec
@@ -110,21 +110,25 @@ BuildRequires:  python-eventlet
 BuildRequires:  python-openstackdocstheme
 BuildRequires:  python-sphinxcontrib-seqdiag
 # to make orphaned-file-tests happy
+%if 0%{?suse_version}
 BuildRequires:  polkit-default-privs
+%endif
 BuildRequires:  systemd-rpm-macros
 Requires:       /usr/bin/truncate
 Requires:       logrotate
 Requires:       openstack-suse-sudo
+%if 0%{?suse_version}
 Requires:       polkit-default-privs
+%endif
 Requires:       python >= 2.7
 Requires:       python-nova = %{version}
 Requires:       python-oslo.config >= 4.0.0
 %{?systemd_requires}
-Requires(post): sysconfig
+# Requires(post): sysconfig
 Requires(pre):  pwdutils
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
-Requires(pre):  %insserv_prereq %fillup_prereq
+# Requires(pre):  %insserv_prereq %fillup_prereq
 
 %description
 OpenStack Nova provides a cloud computing fabric controller,
@@ -476,150 +480,109 @@ crudini --set %{nova_conf} oslo_concurre
 %post
 %tmpfiles_create %{_tmpfilesdir}/%{name}.conf
 
-%pre api
-%service_add_pre openstack-nova-api.service
-
 %post api
-%service_add_post openstack-nova-api.service
+%systemd_post openstack-nova-api.service
 
 %preun api
-%service_del_preun openstack-nova-api.service
+%systemd_preun openstack-nova-api.service
 
 %postun api
-%restart_on_update openstack-nova-api.service
-%service_del_postun openstack-nova-api.service
-
-%pre conductor
-%service_add_pre openstack-nova-conductor.service
+%systemd_postun_with_restart openstack-nova-api.service
 
 %post conductor
-%service_add_post openstack-nova-conductor.service
+%systemd_post openstack-nova-conductor.service
 
 %preun conductor
-%service_del_preun openstack-nova-conductor.service
+%systemd_preun openstack-nova-conductor.service
 
 %postun conductor
-%restart_on_update openstack-nova-conductor.service
-%service_del_postun openstack-nova-conductor.service
-
-%pre console
-%service_add_pre openstack-nova-console.service
+%systemd_postun_with_restart openstack-nova-conductor.service
 
 %post console
-%service_add_post openstack-nova-console.service
+%systemd_post openstack-nova-console.service
+%systemd_post openstack-nova-spicehtml5proxy.service
 
 %preun console
-%service_del_preun openstack-nova-console.service
+%systemd_preun openstack-nova-console.service
+%systemd_preun openstack-nova-spicehtml5proxy.service
 
 %postun console
-%restart_on_update openstack-nova-console.service
-%restart_on_update openstack-nova-spicehtml5proxy
-%service_del_postun openstack-nova-console.service
-
-%pre consoleauth
-%service_add_pre openstack-nova-consoleauth.service
+%systemd_postun_with_restart openstack-nova-console.service
+%systemd_postun_with_restart openstack-nova-spicehtml5proxy.service
 
 %post consoleauth
-%service_add_post openstack-nova-consoleauth.service
+%systemd_post openstack-nova-consoleauth.service
 
 %preun consoleauth
-%service_del_preun openstack-nova-consoleauth.service
+%systemd_preun openstack-nova-consoleauth.service
 
 %postun consoleauth
-%restart_on_update openstack-nova-consoleauth.service
-%service_del_postun openstack-nova-consoleauth.service
-
-%pre cells
-%service_add_pre openstack-nova-cells.service
+%systemd_postun_with_restart openstack-nova-consoleauth.service
 
 %post cells
-%service_add_post openstack-nova-cells.service
+%systemd_post openstack-nova-cells.service
 
 %preun cells
-%service_del_preun openstack-nova-cells.service
+%systemd_preun openstack-nova-cells.service
 
 %postun cells
-%restart_on_update openstack-nova-cells.service
-%service_del_postun openstack-nova-cells.service
-
-%pre compute
-%service_add_pre openstack-nova-compute.service
+%systemd_postun_with_restart openstack-nova-cells.service
 
 %post compute
-%service_add_post openstack-nova-compute.service
+%systemd_post openstack-nova-compute.service
 polkit-auth --grant org.libvirt.unix.manage --user %{username} 2>/dev/null || true
 
 %preun compute
-%service_del_preun openstack-nova-compute.service
+%systemd_preun openstack-nova-compute.service
 
 %postun compute
-%restart_on_update openstack-nova-compute.service
-%service_del_postun openstack-nova-compute.service
-
-%pre network
-%service_add_pre openstack-nova-network.service
+%systemd_postun_with_restart openstack-nova-compute.service
 
 %post network
-%service_add_post openstack-nova-network.service
+%systemd_post openstack-nova-network.service
 
 %preun network
-%service_del_preun openstack-nova-network.service
+%systemd_preun openstack-nova-network.service
 
 %postun network
-%restart_on_update openstack-nova-network.service
-%service_del_postun openstack-nova-network.service
-
-%pre vncproxy
-%service_add_pre openstack-nova-vncproxy.service
+%systemd_postun_with_restart openstack-nova-network.service
 
 %post vncproxy
-%service_add_post openstack-nova-vncproxy.service
+%systemd_post openstack-nova-vncproxy.service
 
 %preun vncproxy
-%service_del_preun openstack-nova-vncproxy.service
+%systemd_preun openstack-nova-vncproxy.service
 
 %postun vncproxy
 %restart_on_update openstack-nova-vncproxy.service
-%service_del_postun openstack-nova-vncproxy.service
-
-%pre novncproxy
-%service_add_pre openstack-nova-novncproxy.service
+%systemd_postun_with_restart openstack-nova-vncproxy.service
 
 %post novncproxy
-%service_add_post openstack-nova-novncproxy.service
+%systemd_post openstack-nova-novncproxy.service
 
 %preun novncproxy
-%service_del_preun openstack-nova-novncproxy.service
+%systemd_preun openstack-nova-novncproxy.service
 
 %postun novncproxy
-%restart_on_update openstack-nova-novncproxy.service
-%service_del_postun openstack-nova-novncproxy.service
-
-%pre serialproxy
-%service_add_pre openstack-nova-serialproxy.service
+%systemd_postun_with_restart openstack-nova-novncproxy.service
 
 %post serialproxy
-%service_add_post openstack-nova-serialproxy.service
+%systemd_post openstack-nova-serialproxy.service
 
 %preun serialproxy
-%service_del_preun openstack-nova-serialproxy.service
+%systemd_preun openstack-nova-serialproxy.service
 
 %postun serialproxy
-%restart_on_update openstack-nova-serialproxy.service
-%service_del_postun openstack-nova-serialproxy.service
-
-%pre scheduler
-%service_add_pre openstack-nova-scheduler.service
+%systemd_postun_with_restart openstack-nova-serialproxy.service
 
 %post scheduler
-%service_add_post openstack-nova-scheduler.service
+%systemd_post openstack-nova-scheduler.service
 
 %preun scheduler
-%service_del_preun openstack-nova-scheduler.service
+%systemd_preun openstack-nova-scheduler.service
 
 %postun scheduler
-%restart_on_update openstack-nova-scheduler.service
-%service_del_postun openstack-nova-scheduler.service
+%systemd_postun_with_restart openstack-nova-scheduler.service
 
 %files
 %defattr(-,root,root,-)