From c654565e828bc0a825acf91ec8c59705a26cd43cc1c5520dc1b4932ee7997e57 Mon Sep 17 00:00:00 2001
From: luce johann <johann.luce@wanadoo.fr>
Date: Fri, 9 Nov 2012 14:47:17 +0000
Subject: [PATCH] Accepting request 140746 from home:jluce2:branches:security

Ufw stands for Uncomplicated Firewall, and is program for managing a netfilter firewall. It provides a command line interface and aims to be uncomplicated and easy to use.

OBS-URL: https://build.opensuse.org/request/show/140746
OBS-URL: https://build.opensuse.org/package/show/security/ufw?expand=0&rev=11
---
 ufw.changes |  6 ++++++
 ufw.spec    | 19 +++++++++++--------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/ufw.changes b/ufw.changes
index ebd9f2a..e90f6d1 100644
--- a/ufw.changes
+++ b/ufw.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Nov  9 12:28:27 UTC 2012 - johann.luce@wanadoo.fr
+
+-fix problem systemd move in /usr
+ fix various warning OBS 
+
 -------------------------------------------------------------------
 Tue Oct 16 14:53:10 UTC 2012 - johann.luce@wanadoo.fr
 
diff --git a/ufw.spec b/ufw.spec
index 58870bd..9cfd1fd 100644
--- a/ufw.spec
+++ b/ufw.spec
@@ -63,13 +63,15 @@ ln -s /etc/init.d/ufw $RPM_BUILD_ROOT/usr/sbin/rcufw
 ln -s /usr/share/man/man8/ufw.8.gz $RPM_BUILD_ROOT/usr/share/man/man8/rcufw.8.gz
 mkdir -p $RPM_BUILD_ROOT/usr/bin/
 ln -s /usr/sbin/ufw $RPM_BUILD_ROOT/usr/bin/ufw
+%if 0%{?suse_version} > 1220
+mkdir -p $RPM_BUILD_ROOT/usr/lib/systemd/
+mkdir -p $RPM_BUILD_ROOT/usr/lib/systemd/system
+install -m 644 $RPM_SOURCE_DIR/ufw.service $RPM_BUILD_ROOT/usr/lib/systemd/system/ufw.service
+%else
 mkdir -p $RPM_BUILD_ROOT/lib/systemd/
 mkdir -p $RPM_BUILD_ROOT/lib/systemd/system
 install -m 644 $RPM_SOURCE_DIR/ufw.service $RPM_BUILD_ROOT/lib/systemd/system/ufw.service
-#mkdir -p $RPM_BUILD_ROOT/etc/systemd/
-#mkdir -p $RPM_BUILD_ROOT/etc/systemd/system/
-#mkdir -p $RPM_BUILD_ROOT/etc/systemd/system/multi-user.target.wants
-#ln -s /lib/systemd/system/ufw.service $RPM_BUILD_ROOT/etc/systemd/system/multi-user.target.wants/ufw.service
+%endif
 
 %pre
 %if 0%{?suse_version} > 1140
@@ -79,8 +81,6 @@ install -m 644 $RPM_SOURCE_DIR/ufw.service $RPM_BUILD_ROOT/lib/systemd/system/uf
 %post
 %if 0%{?suse_version} > 1140
 %service_add_post ufw.service
-%else
-insserv /etc/init.d/ufw
 %endif
 
 %preun
@@ -91,10 +91,9 @@ insserv /etc/init.d/ufw
 
 %postun
 %restart_on_update
+%insserv_cleanup /etc/init.d/ufw
 %if 0%{?suse_version} > 1140
 %service_del_postun ufw.service
-%else
-%insserv_cleanup /etc/init.d/ufw
 %endif
 
 %files
@@ -114,7 +113,11 @@ insserv /etc/init.d/ufw
    %config/etc/ufw
    %config/etc/ufw/applications.d
    %config/etc/default/ufw
+%if 0%{?suse_version} > 1220
+   /usr/lib/systemd/system/ufw.service
+%else
    /lib/systemd/system/ufw.service
+%endif
    /lib/ufw
    /usr/lib/python%python_version/site-packages/ufw
    /usr/share/ufw