configure scripts from well known location

the old location is also supported, but the file is not packaged

diff --git a/apcupsd.spec b/apcupsd.spec
index 394afbb0ba89c353ffda114be71449239f964aad..078e85e2e2a547f6a1ddb564a39396f20aeadceb 100644 (file)
--- a/apcupsd.spec
+++ b/apcupsd.spec
@@ -20,7 +20,7 @@ Source1:      %{name}.init
 Source2:       %{name}.logrotate
 Source3:       %{name}.sysconfig
 Patch0:                %{name}-configure.patch
-
+Patch1:                control-config.patch
 Patch2:                format-security.patch
 Patch3:                shutdown.patch
 Patch4:                cxxld.patch
@@ -38,8 +38,8 @@ BuildRequires:        man-db
 BuildRequires: pkgconfig
 BuildRequires: rpmbuild(macros) >= 1.647
 BuildRequires: util-linux
-Requires:      systemd-units >= 0.38
 Requires:      rc-scripts
+Requires:      systemd-units >= 0.38
 Requires(post):        fileutils
 Requires(post,preun):  /sbin/chkconfig
 Requires(post,preun,postun):   systemd-units >= 38
@@ -96,7 +96,7 @@ serwera NIS. Status każdego UPS-a przedstawia ikona.
 %prep
 %setup -q
 %patch0 -p1
-
+%patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1

diff --git a/apcupsd.sysconfig b/apcupsd.sysconfig
index 61dc3fd439aa2965a4c7a54c824abfb0730f0ee1..29171a234e70c4f501bd0bac5a5adb91b8e5e824 100644 (file)
--- a/apcupsd.sysconfig
+++ b/apcupsd.sysconfig
@@ -3,3 +3,11 @@
 # Try to define nice-level for running apcupsd
 SERVICE_RUN_NICE_LEVEL="+5"
 
+# Options override for apccontrol tool.
+# These would be used by "hook" scripts
+
+# to whom send reports
+SYSADMIN=root
+
+# path to program to use for mail sending
+APCUPSD_MAIL="/bin/mail"

diff --git a/control-config.patch b/control-config.patch
new file mode 100644 (file)
index 0000000..5949923
--- /dev/null
+++ b/control-config.patch
@@ -0,0 +1,10 @@
+--- apcupsd-3.14.13/platforms/apccontrol.in~   2015-09-16 16:48:10.000000000 +0300
++++ apcupsd-3.14.13/platforms/apccontrol.in    2015-09-16 17:16:01.239002981 +0300
+@@ -27,6 +27,7 @@
+ 
+ export SYSADMIN=root
+ export APCUPSD_MAIL="@APCUPSD_MAIL@"
++[ -f /etc/sysconfig/apcupsd ] && . /etc/sysconfig/apcupsd
+ if [ -f $SCRIPTDIR/config ]; then . $SCRIPTDIR/config ; fi
+ 
+ #