[distcc/el6] Revert changes to 3.1-4

[Andy Grover]

commit 936e7659d3530042afcd9262fe278a8b79b2d3dd
Author: Andy Grover <agrover at redhat.com>
Date:   Tue Oct 9 09:34:29 2012 -0700

    Revert changes to 3.1-4
    
    systemd and hardened build changes don't work on el6.
    
    Signed-off-by: Andy Grover <agrover at redhat.com>

 distcc.spec     |   65 +++++++++---------------------------------------------
 distccd.service |   11 ---------
 2 files changed, 11 insertions(+), 65 deletions(-)
---
diff --git a/distcc.spec b/distcc.spec
index c854ff5..88108ae 100644
--- a/distcc.spec
+++ b/distcc.spec
@@ -1,4 +1,3 @@
-%define _hardened_build 1
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 # eval to 2.3 if python isn't yet present, workaround for no python in fc4 minimal buildroot
 %{!?python_version: %define python_version %(%{__python} -c 'import sys; print sys.version.split(" ")[0]' || echo "2.3")}
@@ -6,14 +5,14 @@
 
 Name:       distcc
 Version:    3.1
-Release:    7%{?dist}
+Release:    4%{?dist}
 Summary:    Distributed C/C++ compilation
 Group:      Development/Tools
 License:    GPLv2+
 URL:        http://distcc.org/
 Source0:    http://distcc.googlecode.com/files/distcc-%{version}.tar.bz2
 Source1:    hosts.sample
-Source2:    distccd.service
+Source2:    distccd.init
 #Patch0:     distcc-2.18.3-avahi.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -37,12 +36,9 @@ Summary:    Server for distributed C/C++ compilation
 Group:      Development/Tools
 License:    GPLv2+
 
-#Requires(post): /sbin/chkconfig
-#Requires(preun): /sbin/chkconfig
-Requires(post): systemd-units
-Requires(preun): systemd-units
-Requires(postun): systemd-units
-Requires(post): systemd-sysv
+Requires(post): /sbin/chkconfig
+Requires(preun): /sbin/chkconfig
+
 
 %description server
 This package contains the compilation server needed to use %{name}.
@@ -50,7 +46,7 @@ This package contains the compilation server needed to use %{name}.
 
 %prep
 %setup -q
-#%%patch0 -p1 -b .avahi
+#%patch0 -p1 -b .avahi
 
 
 %build
@@ -74,11 +70,7 @@ install -Dm 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/hosts
 install -Dm 0644 contrib/redhat/sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/distccd
 
 # Install distccd init file
-#install -Dm 0755 %%{SOURCE2} $RPM_BUILD_ROOT%%{_sysconfdir}/init.d/distccd
-
-# Install distcdd unit file
-mkdir -p $RPM_BUILD_ROOT%{_unitdir}
-install -Dm 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_unitdir}/distccd.service
+install -Dm 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/distccd
 
 
 %post
@@ -86,41 +78,16 @@ update-desktop-database &> /dev/null ||:
 
 
 %post server
-#[ $1 -lt 2 ] && /sbin/chkconfig --add distccd ||:
-if [ $1 -eq 1 ] ; then 
-    # Initial installation 
-    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-fi
+[ $1 -lt 2 ] && /sbin/chkconfig --add distccd ||:
 
-%preun server
-#[ $1 -eq 0 ] && /sbin/chkconfig --del distccd ||:
-if [ $1 -eq 0 ] ; then
-    # Package removal, not upgrade
-    /bin/systemctl --no-reload disable distccd.service > /dev/null 2>&1 || :
-    /bin/systemctl stop distccd.service > /dev/null 2>&1 || :
-fi
 
-%postun server
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-if [ $1 -ge 1 ] ; then
-    # Package upgrade, not uninstall
-    /bin/systemctl try-restart distccd.service >/dev/null 2>&1 || :
-fi
+%preun server
+[ $1 -eq 0 ] && /sbin/chkconfig --del distccd ||:
 
 
 %postun
 update-desktop-database &> /dev/null ||:
 
-%triggerun -- distcc-server < 3.1-5
-# Save the current service runlevel info
-# User must manually run systemd-sysv-convert --apply distccd
-# to migrate them to systemd targets
-/usr/bin/systemd-sysv-convert --save distccd >/dev/null 2>&1 ||:
-
-# Run these because the SysV package being removed won't do them
-/sbin/chkconfig --del distccd >/dev/null 2>&1 || :
-/bin/systemctl try-restart distccd.service >/dev/null 2>&1 || :
-
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -145,8 +112,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc COPYING README
 %{_bindir}/distccd
-#%%{_sysconfdir}/init.d/*
-%{_unitdir}/*
+%{_sysconfdir}/init.d/*
 %{_sysconfdir}/default/distcc
 %{_sysconfdir}/distcc/*allow*
 %{_mandir}/man1/distccd*
@@ -156,15 +122,6 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/include_server*
 
 %changelog
-* Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Fri Apr 13 2012 Jon Ciesla <limburgher at gmail.com> - 3.1-6
-- Add hardened build.
-
-* Tue Jan 31 2012 Jon Ciesla <limburgher at gmail.com> - 3.1-5
-- Migrate to systemd, BZ 770409.
-
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild