[polipo] - Fixed the bad value of ExecStart in the polipo.service file (bz #818688) - Added the (missing) sys

[jcp]

commit 5e838fea2cdc17a16e7003cb829abd5edb2a7d8e
Author: John C. Peterson <jcp at eskimo.com>
Date:   Sun Jun 24 21:06:21 2012 -0700

    - Fixed the bad value of ExecStart in the polipo.service file (bz #818688)
    - Added the (missing) sysconfig environment file (bz #818688)
    - Renumbered the last few source files (cosmetic)

 polipo.service   |    2 +-
 polipo.spec      |   12 ++++++++++--
 polipo.sysconfig |    2 ++
 3 files changed, 13 insertions(+), 3 deletions(-)
---
diff --git a/polipo.service b/polipo.service
index af6fe39..10a5925 100644
--- a/polipo.service
+++ b/polipo.service
@@ -7,7 +7,7 @@ Type=oneshot
 User=polipo
 Group=polipo
 EnvironmentFile=/etc/sysconfig/polipo
-ExecStart=/usr/sbin/polipo -c $CONFIG
+ExecStart=/usr/bin/polipo -c $CONFIG
 RemainAfterExit=yes
 
 [Install]
diff --git a/polipo.spec b/polipo.spec
index 2ede1fe..c200e5e 100644
--- a/polipo.spec
+++ b/polipo.spec
@@ -21,7 +21,8 @@ Source4:        %{name}.logrotate
 Source5:        %{name}.nm
 Source6:        %{name}.tmpfiles
 Source7:        %{name}.service
-Source8:        %{name}.cron
+Source8:        %{name}.sysconfig
+Source9:        %{name}.cron
 Patch0:         http-assertion-failure.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Group:          System Environment/Daemons
@@ -74,7 +75,7 @@ install -D -p -m 0644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/config
 install -D -p -m 0644 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/forbidden
 install -D -p -m 0644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/%{name}
 install -D -p -m 0755 %{SOURCE5} $RPM_BUILD_ROOT/%{_sysconfdir}/NetworkManager/dispatcher.d/25-%{name}
-install -D -p -m 0755 %{SOURCE8} $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily/%{name}
+install -D -p -m 0755 %{SOURCE9} $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily/%{name}
 
 %if 0%{?_with_tmpfilesd}
 install -D -p -m 0644 %{SOURCE6} $RPM_BUILD_ROOT/%{_sysconfdir}/tmpfiles.d/%{name}.conf
@@ -83,6 +84,7 @@ install -d -m 0755 $RPM_BUILD_ROOT/%{_localstatedir}/run/%{name}
 
 %if 0%{?_with_systemd}
 install -D -p -m 0644 %{SOURCE7} $RPM_BUILD_ROOT/%{_unitdir}/%{name}.service
+install -D -p -m 0644 %{SOURCE8} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/%{name}
 %else
 install -D -p -m 0755 %{SOURCE1} $RPM_BUILD_ROOT/%{_initddir}/%{name}
 %endif
@@ -181,6 +183,7 @@ fi
 
 %if 0%{?_with_systemd}
 %{_unitdir}/%{name}.service
+%{_sysconfdir}/sysconfig/%{name}
 %else
 %attr(0755,root,root) %{_initddir}/%{name}
 %endif
@@ -191,6 +194,11 @@ fi
 %attr(0755,%{name},%{name}) %dir %{_localstatedir}/run/%{name}
 
 %changelog
+* Sun Jun 24 2012 John C. Peterson <jcp at eskimo.com> - 1.0.4.1-7
+- Fixed the bad value of ExecStart in the polipo.service file (bz #818688)
+- Added the (missing) sysconfig environment file (bz #818688)
+- Renumbered the last few source files (cosmetic)
+
 * Sun Jan 22 2012 Bernard Johnson <bjohnson at symetrix.com> - 1.0.4.1-6
 - add daily cache cleanup
 - fix missing creation of /var/run directory (bz #755198)
diff --git a/polipo.sysconfig b/polipo.sysconfig
new file mode 100644
index 0000000..2c68bce
--- /dev/null
+++ b/polipo.sysconfig
@@ -0,0 +1,2 @@
+# Command line options for polipo
+CONFIG=/etc/polipo/config