[interchange-cvs] interchange - jon modified 2 files

[interchange-cvs at icdevgroup.org]

User:      jon
Date:      2005-05-09 21:36:37 GMT
Modified:  SPECS    interchange-wrapper interchange.spec
Log:
Use PERL_SIGNALS=unsafe.
Fix eg/te installation.
Use symlink to move debug.log, to work with current interchange.cfg.

Revision  Changes    Path
2.3       +4 -2      interchange/SPECS/interchange-wrapper


rev 2.3, prev_rev 2.2
Index: interchange-wrapper
===================================================================
RCS file: /var/cvs/interchange/SPECS/interchange-wrapper,v
retrieving revision 2.2
retrieving revision 2.3
diff -u -u -r2.2 -r2.3
--- interchange-wrapper	18 Aug 2002 15:11:32 -0000	2.2
+++ interchange-wrapper	9 May 2005 21:36:37 -0000	2.3
@@ -3,6 +3,7 @@
 # Interchange control script
 # Calls Interchange with special locations of files as installed by RPM
 # http://www.icdevgroup.org/
+# $Id: interchange-wrapper,v 2.3 2005/05/09 21:36:37 jon Exp $
 
 IC=/usr/lib/interchange
 ETC=/etc
@@ -22,8 +23,9 @@
 	IPCsocket=$RUN/socket.ipc"
 
 if test "`whoami`" = root
-then 
-	exec su - interch -c "$RUNSTRING $*"
+then
+	exec su - interch -c "PERL_SIGNALS=unsafe $RUNSTRING $*"
 else
+	export PERL_SIGNALS=unsafe
 	exec $RUNSTRING $*
 fi



2.28      +26 -10    interchange/SPECS/interchange.spec


rev 2.28, prev_rev 2.27
Index: interchange.spec
===================================================================
RCS file: /var/cvs/interchange/SPECS/interchange.spec,v
retrieving revision 2.27
retrieving revision 2.28
diff -u -u -r2.27 -r2.28
--- interchange.spec	24 Jan 2005 22:08:14 -0000	2.27
+++ interchange.spec	9 May 2005 21:36:37 -0000	2.28
@@ -1,5 +1,7 @@
+# $Id: interchange.spec,v 2.28 2005/05/09 21:36:37 jon Exp $
+
 # use Perl installation in /usr/local custom built from source?
-%define localperl 0
+%define localperl 1
 
 %if %localperl
 %define __perl /usr/local/bin/perl
@@ -26,7 +28,6 @@
 Source2: interchange-init
 Source3: interchange-logrotate
 Source4: interchange-cron
-Source5: interchange.cfg.patch
 License: GPL
 Prereq: /sbin/chkconfig, /sbin/service, /usr/sbin/useradd, /usr/sbin/groupadd
 Requires: perl >= 5.6.0
@@ -70,6 +71,8 @@
 %__rm -rf $RPM_BUILD_ROOT
 %__mkdir_p $RPM_BUILD_ROOT
 
+export PERL_SIGNALS=unsafe
+
 ETCBASE=%{_sysconfdir}
 RUNBASE=%{_localstatedir}/run
 LOGBASE=%{_localstatedir}/log
@@ -89,12 +92,16 @@
 %__make test
 %__make NOCPANINSTALL=1 install
 
+# Install te program
+%__mkdir_p $RPM_BUILD_ROOT%_bindir
+%__install -m755 eg/te $RPM_BUILD_ROOT%_bindir
+%__rm -f eg/te
+
 # 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
-%__cp -p eg/te $RPM_BUILD_ROOT%_bindir
 
 # Tell Perl where to find IC libraries during build time
 export PERL5LIB=$RPM_BUILD_ROOT$ICBASE/lib
@@ -187,7 +194,7 @@
 %__ln_s $ETCBASE/interchange.cfg
 
 # Move location of debug log to /var/log/interchange
-patch -p0 $ETCBASE/interchange.cfg < %SOURCE5
+%__ln_s $LOGBASE/interchange/debug.log $RPM_BUILD_ROOT$ICBASE
 
 # Put global error log in /var/log/interchange instead of IC software directory
 RPMICLOG=$LOGBASE/interchange/error.log
@@ -247,7 +254,7 @@
 %doc README.rpm-dist
 %doc README.cvs
 %doc UPGRADE
-%doc WHATSNEW
+%doc WHATSNEW*
 %config(noreplace) %{_sysconfdir}/logrotate.d/interchange
 %config(noreplace) %{_sysconfdir}/cron.daily/interchange
 %config %{_sysconfdir}/rc.d/init.d/interchange
@@ -270,11 +277,14 @@
 
 %post
 
-# Create the error log if it doesn't exist
-if [ ! -f %{_localstatedir}/log/interchange/error.log ]; then
-    touch %{_localstatedir}/log/interchange/error.log
-    %__chown %{ic_user}.%{ic_group} %{_localstatedir}/log/interchange/error.log
-fi
+# Create the error and debug logs if they don't exist
+for i in error.log debug.log
+do
+	if [ ! -f %{_localstatedir}/log/interchange/$i ]; then
+		touch %{_localstatedir}/log/interchange/$i
+		%__chown %{ic_user}.%{ic_group} %{_localstatedir}/log/interchange/$i
+	fi
+done
 
 # Optionally set Interchange to start/stop with the operating system.
 #/sbin/chkconfig --add interchange
@@ -386,6 +396,12 @@
 
 
 %changelog
+* Mon May  9 2005 Jon Jensen <jon at icdevgroup.org>
+- Set PERL_SIGNALS=unsafe in environment during build and run.
+- Remove interchange.cfg patch and symlink debug.log instead.
+- Fixed problem installing eg/te.
+- Updated to Interchange 5.3.1.
+
 * Mon Jul 12 2004 Jon Jensen <jon at icdevgroup.org>
 - Switch demo catalog to Standard instead of older Foundation.