[aiccu] Change service file to get not complains when /etc/sysconfig/aiccu is missing Change PID file in aic

[Jochen Schmitt]

commit dfcc0a24252cfed8d707016d187b03b9c633b5b4
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date:   Mon Jul 18 18:10:29 2011 +0200

    Change service file to get not complains when /etc/sysconfig/aiccu is missing
    Change PID file in aiccu.conf to /run/aiccu.pid

 aiccu-run.patch |   16 ++++++++++++++--
 aiccu.service   |    2 +-
 aiccu.spec      |   10 +++++-----
 3 files changed, 20 insertions(+), 8 deletions(-)
---
diff --git a/aiccu-run.patch b/aiccu-run.patch
index 21d0100..bb9d3f3 100644
--- a/aiccu-run.patch
+++ b/aiccu-run.patch
@@ -1,6 +1,6 @@
 diff -up aiccu/common/aiccu.h.run aiccu/common/aiccu.h
---- aiccu/common/aiccu.h.run	2011-07-06 22:22:40.944419473 +0200
-+++ aiccu/common/aiccu.h	2011-07-06 22:23:57.240419462 +0200
+--- aiccu/common/aiccu.h.run	2007-01-15 13:01:43.000000000 +0100
++++ aiccu/common/aiccu.h	2011-07-18 18:00:22.313521552 +0200
 @@ -68,7 +68,7 @@
  #define AICCU_CACHE	"/var/cache/aiccu.cache"
  
@@ -10,3 +10,15 @@ diff -up aiccu/common/aiccu.h.run aiccu/common/aiccu.h
  
  /* AICCU Configuration file */
  #ifdef _WIN32
+diff -up aiccu/doc/aiccu.conf.run aiccu/doc/aiccu.conf
+--- aiccu/doc/aiccu.conf.run	2011-07-18 18:02:32.898521537 +0200
++++ aiccu/doc/aiccu.conf	2011-07-18 18:03:12.086521529 +0200
+@@ -47,7 +47,7 @@ automatic true
+ requiretls false
+ 
+ # PID File
+-#pidfile /var/run/aiccu.pid
++pidfile /run/aiccu.pid
+ 
+ # Add a default route (default: true)
+ #defaultroute true
diff --git a/aiccu.service b/aiccu.service
index 072e01c..844c27f 100644
--- a/aiccu.service
+++ b/aiccu.service
@@ -4,7 +4,7 @@ After=syslog.target network.target
 
 [Service]
 Type=forking
-EnvironmentFile=/etc/sysconfig/aiccu
+EnvironmentFile=-/etc/sysconfig/aiccu
 ExecStart=/usr/sbin/aiccu start $OPTIONS
 ExecStop=/usr/sbin/aiccu stop
 PIDFile=/run/aiccu.pid
diff --git a/aiccu.spec b/aiccu.spec
index 53c2660..a186cf5 100644
--- a/aiccu.spec
+++ b/aiccu.spec
@@ -9,7 +9,7 @@
 Summary:   SixXS Automatic IPv6 Connectivity Client Utility
 Name:      aiccu
 Version:   2007.01.15
-Release:   9%{?dist}
+Release:   10%{?dist}
 License:   BSD
 Group:     System Environment/Daemons
 URL:       http://www.sixxs.net/tools/aiccu/
@@ -55,9 +55,6 @@ rm $RPM_BUILD_ROOT%{_sysconfdir}/init.d/*
 mkdir -p $RPM_BUILD_ROOT%{_unitdir}
 install -p %{SOURCE1} $RPM_BUILD_ROOT%{_unitdir}/
 
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
-touch $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/aiccu
-
 %post
 if [ "$1" = "1" ]; then
 	/bin/systemctl --daemon-reload >/dev/null 2>&1 || :
@@ -86,9 +83,12 @@ make clean
 # make it readable by non-root
 %attr(600, root,root) %config(noreplace) %{_sysconfdir}/aiccu.conf
 %{_unitdir}/aiccu.service
-%{_sysconfdir}/sysconfig/aiccu
 
 %changelog
+* Mon Jul 18 2011 Jochen Schmitt <Jochen herr-schmitt de> - 2007.01.15-10
+- Change service file to get not complains when /etc/sysconfig/aiccu is missing
+- Change PID file in aiccu.conf to /run/aiccu.pid
+
 * Wed Jul  6 2011 Jochen Schmitt <Jochen herr-schmitt de> - 2007.01.15-9
 - Implementing native systemd support (656886)