- Remove fix-default-systemd-unit-dir.patch

+ No longer needed, proper systemd config dir is queried from pckg-config

OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/cloud-init?expand=0&rev=119

cloud-init.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Aug 24 19:29:03 UTC 2018 - rjschwei@suse.com
+
+- Remove fix-default-systemd-unit-dir.patch
+  + No longer needed, proper systemd config dir is queried from pckg-config
+
 -------------------------------------------------------------------
 Thu Jul  5 17:59:12 UTC 2018 - rjschwei@suse.com
 

cloud-init.spec

@@ -32,7 +32,6 @@ Source1:        rsyslog-cloud-init.cfg
 # proposed for upstream merge (lp#1732966)
 Patch8:         cloud-init-translate-netconf-ipv4-keep-gw.patch
 Patch10:        cloud-init-no-user-lock-if-already-locked.patch
-Patch12:        fix-default-systemd-unit-dir.patch
 # python2 disables SIGPIPE, causing broken pipe errors in shell scripts (bsc#903449)
 Patch20:        cloud-init-python2-sigpipe.patch
 Patch27:        cloud-init-sysconfig-netpathfix.patch
@@ -193,7 +192,6 @@ Documentation and examples for cloud-init tools
 %setup -q
 %patch8
 %patch10 -p1
-%patch12
 %if 0%{?suse_version} < 1315
 %patch20
 %endif

fix-default-systemd-unit-dir.patch

@@ -1,28 +0,0 @@
-Index: setup.py
-===================================================================
---- setup.py.orig
-+++ setup.py
-@@ -52,8 +52,8 @@ def tiny_p(cmd, capture=True):
- def pkg_config_read(library, var):
-     fallbacks = {
-         'systemd': {
--            'systemdsystemunitdir': '/lib/systemd/system',
--            'systemdsystemgeneratordir': '/lib/systemd/system-generators',
-+            'systemdsystemunitdir': '/usr/lib/systemd/system',
-+            'systemdsystemgeneratordir': '/usr/lib/systemd/system-generators',
-         }
-     }
-     cmd = ['pkg-config', '--variable=%s' % var, library]
-Index: systemd/cloud-init-generator
-===================================================================
---- systemd/cloud-init-generator.orig
-+++ systemd/cloud-init-generator
-@@ -9,7 +9,7 @@ DISABLE="disabled"
- FOUND="found"
- NOTFOUND="notfound"
- RUN_ENABLED_FILE="$LOG_D/$ENABLE"
--CLOUD_SYSTEM_TARGET="/lib/systemd/system/cloud-init.target"
-+CLOUD_SYSTEM_TARGET="/usr/lib/systemd/system/cloud-init.target"
- CLOUD_TARGET_NAME="cloud-init.target"
- # lxc sets 'container', but lets make that explicitly a global
- CONTAINER="${container}"