--- interchange.spec.orig	2008-05-03 23:25:31.000000000 -0400
+++ interchange.spec	2008-05-03 23:28:12.000000000 -0400
@@ -1,7 +1,7 @@
 # $Id: interchange.spec,v 2.30 2007-08-31 00:23:43 kwalsh Exp $
 
 # use Perl installation in /usr/local custom built from source?
-%define localperl 1
+%define localperl 0
 
 %if %localperl
 %define __perl /usr/local/bin/perl
@@ -24,14 +24,10 @@
 URL: http://www.icdevgroup.org/
 Packager: Jon Jensen <jon@icdevgroup.org>
 Source0: http://www.icdevgroup.org/interchange/interchange-%{version}.tar.gz
-Source1: interchange-wrapper
-Source2: interchange-init
-Source3: interchange-logrotate
-Source4: interchange-cron
 License: GPL
 Prereq: /sbin/chkconfig, /sbin/service, /usr/sbin/useradd, /usr/sbin/groupadd
-Requires: perl >= 5.6.0
-BuildPrereq: perl >= 5.6.0
+Requires: perl >= 5.8.8
+BuildPrereq: perl >= 5.8.8
 
 %description
 Interchange is a complete web application platform focused on
@@ -99,10 +95,25 @@
 
 # Copy over extra stuff that usually stays in source directory
 %__mkdir_p $RPM_BUILD_ROOT$ICBASE/build
-%__cp -p extra/HTML/Entities.pm $RPM_BUILD_ROOT$ICBASE/build
 %__cp -p extra/IniConf.pm $RPM_BUILD_ROOT$ICBASE/build
 %__cp -R -p eg extensions $RPM_BUILD_ROOT$ICBASE
 
+# Install wrapper script
+%__mkdir_p $RPM_BUILD_ROOT%{_sbindir}
+%__install -m755 SPECS/interchange-wrapper $RPM_BUILD_ROOT%{_sbindir}/interchange
+
+# Install SysV-style system startup/shutdown script
+%__mkdir_p $RPM_BUILD_ROOT$ETCBASE/rc.d/init.d
+%__install -m755 SPECS/interchange-init $RPM_BUILD_ROOT$ETCBASE/rc.d/init.d/interchange
+
+# Install log rotation script
+%__mkdir_p $RPM_BUILD_ROOT$ETCBASE/logrotate.d
+%__install -m644 SPECS/interchange-logrotate $RPM_BUILD_ROOT$ETCBASE/logrotate.d/interchange
+
+# Install expired session and tmp removal cron job
+%__mkdir_p $RPM_BUILD_ROOT$ETCBASE/cron.daily
+%__install -m755 SPECS/interchange-cron $RPM_BUILD_ROOT$ETCBASE/cron.daily/interchange
+
 # Tell Perl where to find IC libraries during build time
 export PERL5LIB=$RPM_BUILD_ROOT$ICBASE/lib
 export MINIVEND_ROOT=$RPM_BUILD_ROOT$ICBASE
@@ -119,22 +130,6 @@
 %__mkdir_p $RPM_BUILD_ROOT$LOGBASE/interchange
 %__mkdir_p $RPM_BUILD_ROOT$CACHEBASE/interchange
 
-# Install wrapper script
-%__mkdir_p $RPM_BUILD_ROOT%{_sbindir}
-%__install -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_sbindir}/interchange
-
-# Install SysV-style system startup/shutdown script
-%__mkdir_p $RPM_BUILD_ROOT$ETCBASE/rc.d/init.d
-%__install -m755 %{SOURCE2} $RPM_BUILD_ROOT$ETCBASE/rc.d/init.d/interchange
-
-# Install log rotation script
-%__mkdir_p $RPM_BUILD_ROOT$ETCBASE/logrotate.d
-%__install -m644 %{SOURCE3} $RPM_BUILD_ROOT$ETCBASE/logrotate.d/interchange
-
-# Install expired session and tmp removal cron job
-%__mkdir_p $RPM_BUILD_ROOT$ETCBASE/cron.daily
-%__install -m755 %{SOURCE4} $RPM_BUILD_ROOT$ETCBASE/cron.daily/interchange
-
 # Build the demo catalog
 HOST=RPM_CHANGE_HOST
 BASEDIR=%{_localstatedir}/lib/interchange