[interchange-cvs] interchange - jon modified 6 files
interchange-cvs at icdevgroup.org
interchange-cvs at icdevgroup.org
Mon Nov 10 06:51:21 UTC 2008
User: jon
Date: 2008-11-10 06:51:21 GMT
Modified: . Tag: STABLE_5_6-branch Makefile.PL README
Modified: README.rpm-dist
Modified: SPECS Tag: STABLE_5_6-branch interchange.spec
Modified: dist/standard/products Tag: STABLE_5_6-branch
Modified: mv_metadata.asc
Modified: scripts Tag: STABLE_5_6-branch interchange.PL
Log:
Bump version number to 5.6.1 and merge 5.7.x RPM packaging changes.
Revision Changes Path
No revision
No revision
2.64.2.2 interchange/Makefile.PL
rev 2.64.2.2, prev_rev 2.64.2.1
Index: Makefile.PL
===================================================================
RCS file: /var/cvs/interchange/Makefile.PL,v
retrieving revision 2.64.2.1
retrieving revision 2.64.2.2
diff -u -u -r2.64.2.1 -r2.64.2.2
--- Makefile.PL 21 May 2008 00:15:31 -0000 2.64.2.1
+++ Makefile.PL 10 Nov 2008 06:51:21 -0000 2.64.2.2
@@ -28,7 +28,7 @@
my @remove_old;
my $Lock_troubles;
-$VERSION = '5.6.0';
+$VERSION = '5.6.1';
my @os_hints;
eval {
2.37.2.2 interchange/README
rev 2.37.2.2, prev_rev 2.37.2.1
Index: README
===================================================================
RCS file: /var/cvs/interchange/README,v
retrieving revision 2.37.2.1
retrieving revision 2.37.2.2
diff -u -u -r2.37.2.1 -r2.37.2.2
--- README 21 May 2008 00:15:31 -0000 2.37.2.1
+++ README 10 Nov 2008 06:51:21 -0000 2.37.2.2
@@ -2,7 +2,7 @@
I N T E R C H A N G E
-Interchange 5.6.0
+Interchange 5.6.1
Copyright (C) 2002-2008 Interchange Development Group
Copyright (C) 1996-2002 Red Hat, Inc.
@@ -101,8 +101,8 @@
Here is the quick installation summary:
- tar xvzf interchange-5.6.0.tar.gz
- cd interchange-5.6.0
+ tar xvzf interchange-5.6.1.tar.gz
+ cd interchange-5.6.1
perl Makefile.PL
make
make test
1.9.2.2 interchange/README.rpm-dist
rev 1.9.2.2, prev_rev 1.9.2.1
Index: README.rpm-dist
===================================================================
RCS file: /var/cvs/interchange/README.rpm-dist,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -u -u -r1.9.2.1 -r1.9.2.2
--- README.rpm-dist 21 May 2008 00:15:31 -0000 1.9.2.1
+++ README.rpm-dist 10 Nov 2008 06:51:21 -0000 1.9.2.2
@@ -31,7 +31,7 @@
Sessions and temporary files: /var/cache/interchange.
-Documentation: /usr/share/doc/interchange-5.6.0.
+Documentation: /usr/share/doc/interchange-5.6.1.
On a dedicated production server, it is wise to segregate as many of these
directories as possible onto their own partitions, to prevent problems if
@@ -45,14 +45,7 @@
install them yourself. It's best to locate RPMs for each of the needed
Perl modules and install them. To get a complete list of dependencies, do:
-rpm -qp --requires interchange-5.6.0-1.i386.rpm
-
-Note that some of the dependencies are not actually necessary. For example,
-the Cybercash modules (CCMck*) are only needed if you use the Cybercash
-payment gateway, which is now rare. The Apache::* modules are only needed
-if you use the mod_perl-native server option, which is also very rare. DBI
-is only needed if you're going to use an SQL database. But that's quite
-common.
+rpm -qp --requires interchange-5.6.1-1.*.rpm
Unfortunately, there's not currently a reliable, steady source of the latest
CPAN modules in RPM format for most operating systems. Thus the easiest way
@@ -71,25 +64,16 @@
perl -MCPAN -e'install Bundle::InterchangeKitchenSink'
-PERL BUILD
-
-As of the date of this writing, there are problems using Interchange with
-a threaded Perl, so you must have or install an unthreaded Perl build.
-The RPMs built for Red Hat Linux 8.0, 9, Fedora Core, and Red Hat Enterprise
-Linux 3.0 all assume you'll be using a custom Perl build in /usr/local.
-This is unfortunate but is considered the best workaround at the moment.
-
-
INSTALL
-rpm -Uvh interchange-5.6.0-1.i386.rpm
-rpm -Uvh interchange-standard-5.6.0-1.i386.rpm
+rpm -Uvh interchange-5.6.1-1.*.rpm
+rpm -Uvh interchange-standard-5.6.1-1.*.rpm
-Your version of RPM may correctly recognize Perl modules even if they
-were not installed via RPM. But it may not. If not, you'll need to install
-the main interchange package without dependency checking:
+If you have installed CPAN modules from source, rather than RPM, you'll need
+to install the main interchange package without dependency checking because
+RPM doesn't know about those modules you installed:
-rpm -Uvh --nodeps interchange-5.6.0-1.i386.rpm
+rpm -Uvh --nodeps interchange-5.6.1-1.*.rpm
STARTING/RESTARTING INTERCHANGE
@@ -149,7 +133,7 @@
INSTALL
-rpm -Uvh interchange-standard-demo-5.6.0-1.i386.rpm
+rpm -Uvh interchange-standard-demo-5.6.1-1.*.rpm
USING THE DEMO
No revision
No revision
2.31.2.2 interchange/SPECS/interchange.spec
rev 2.31.2.2, prev_rev 2.31.2.1
Index: interchange.spec
===================================================================
RCS file: /var/cvs/interchange/SPECS/interchange.spec,v
retrieving revision 2.31.2.1
retrieving revision 2.31.2.2
diff -u -u -r2.31.2.1 -r2.31.2.2
--- interchange.spec 21 May 2008 00:15:31 -0000 2.31.2.1
+++ interchange.spec 10 Nov 2008 06:51:21 -0000 2.31.2.2
@@ -1,12 +1,15 @@
-# $Id: interchange.spec,v 2.31.2.1 2008-05-21 00:15:31 jon Exp $
+# $Id: interchange.spec,v 2.31.2.2 2008-11-10 06:51:21 jon 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
%endif
+# Don't install into /usr/lib64 on x86_64
+%define _libdir /usr/lib
+
%define ic_user interch
%define ic_group interch
@@ -16,22 +19,21 @@
Summary: Interchange web application platform
Name: interchange
-Version: 5.6.0
+Version: 5.6.1
Release: 1
Vendor: Interchange Development Group
Group: System Environment/Daemons
BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
URL: http://www.icdevgroup.org/
-Packager: Jon Jensen <jon at icdevgroup.org>
+Packager: Jon Jensen <jon at endpoint.com>
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.8.8
BuildPrereq: perl >= 5.8.8
+Requires: perl >= 5.8.8
+Requires: perl(Safe::Hole)
+Requires: perl(Set::Crontab)
+Requires: interchange = %{version}-%{release}
%description
Interchange is a complete web application platform focused on
@@ -51,7 +53,7 @@
%package standard-demo
Summary: A prebuilt demonstration store for Interchange
Group: System Environment/Daemons
-Prereq: interchange = %{version}-%{release}
+Requires: interchange = %{version}-%{release}
%description standard-demo
This demo is a prebuilt installation of the Standard Store that
@@ -85,7 +87,7 @@
rpmbuilddir=$RPM_BUILD_ROOT \
INTERCHANGE_USER=%ic_user \
PREFIX=$RPM_BUILD_ROOT$ICBASE \
- INSTALLMAN1DIR=$RPM_BUILD_ROOT%{_mandir}/man1 \
+ INSTALLMAN1DIR=$RPM_BUILD_ROOT%{_mandir}/man8 \
INSTALLMAN3DIR=$RPM_BUILD_ROOT%{_mandir}/man8 \
force=1
%__make
@@ -98,11 +100,24 @@
%__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
+# 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 +134,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
@@ -207,13 +206,13 @@
# I don't know of a way to exclude a subdirectory from one of the directories
# listed in the %files section, so I have to use this monstrosity to generate
-# a list of all directories in /usr/lib/interchange except the standard demo
+# a list of all directories in %{_libdir}/interchange except the standard demo
# directory and pass the list to %files below.
DIRDEPTH=`echo $ICBASE | sed 's:[^/]::g' | awk '{print length + 1}'`
cd $RPM_BUILD_ROOT
-find . -path .$ICBASE/standard -prune -mindepth $DIRDEPTH -maxdepth $DIRDEPTH \
+find . -mindepth $DIRDEPTH -maxdepth $DIRDEPTH -path .$ICBASE/standard -prune \
-o -print | %__grep "^\.$ICBASE" | sed 's:^\.::' | \
- %__sed 's:^\(/usr/lib/interchange/etc\):%attr(-, %{ic_user}, %{ic_group}) \1:' \
+ %__sed 's:^\(%{_libdir}/interchange/etc\):%attr(-, %{ic_user}, %{ic_group}) \1:' \
> %filelist
@@ -222,12 +221,14 @@
%pre
-/sbin/service interchange stop >/dev/null 2>&1 || :
+/sbin/service interchange stop >/dev/null 2>&1
# Create interch user/group if they don't already exist
-/usr/sbin/groupadd -g 52 %ic_group 2>/dev/null || :
+/usr/sbin/groupadd -g 52 %ic_group 2>/dev/null
/usr/sbin/useradd -u 52 -g %ic_group -c "Interchange server" -s /bin/bash \
- -r -d %{_localstatedir}/lib/interchange %ic_user 2>/dev/null || :
+ -r -d %{_localstatedir}/lib/interchange %ic_user 2>/dev/null
+
+exit 0
%files standard
@@ -282,7 +283,7 @@
do
if [ ! -f %{_localstatedir}/log/interchange/$i ]; then
touch %{_localstatedir}/log/interchange/$i
- %__chown %{ic_user}.%{ic_group} %{_localstatedir}/log/interchange/$i
+ %__chown %{ic_user}:%{ic_group} %{_localstatedir}/log/interchange/$i
fi
done
@@ -292,20 +293,6 @@
# Get to a place where no random Perl libraries should be found
cd /usr
-# Install private copies of key CPAN modules if necessary
-status=`%__perl -e "require HTML::Entities and print 1;" 2>/dev/null`
-if test "x$status" != x1
-then
- %__mkdir_p %{_libdir}/interchange/lib/HTML 2>/dev/null
- %__cp -p %{_libdir}/interchange/build/Entities.pm %{_libdir}/interchange/lib/HTML 2>/dev/null
-fi
-
-status=`%__perl -e "require IniConf and print 1;" 2>/dev/null`
-if test "x$status" != x1
-then
- %__cp -p %{_libdir}/interchange/build/IniConf.pm %{_libdir}/interchange/lib 2>/dev/null
-fi
-
# Storable is technically optional; be careful in case user
# installed with --nodeps
status=`%__perl -e "require Storable and print 1;" 2>/dev/null`
@@ -396,6 +383,31 @@
%changelog
+* Sun Nov 9 2008 Jon Jensen <jon at endpoint.com> 5.6.1-1
+- Update for new release.
+
+* Tue Aug 12 2008 Jon Jensen <jon at endpoint.com> 5.7.0-1
+- (Note that there are still problems with the Standard demo and the RPM
+ Perl dependency extractor that need to be worked out ...)
+- Bundled version of HTML::Entities has been removed, so don't look for it.
+- Update syntax used for chown and find.
+- Install all man pages to section 8, so the man page for Interchange's
+ crontab script doesn't conflict with the system crontab program, and since
+ Interchange's "binaries" aren't typically in PATH anyway.
+- Stop using deprecated RPM PreReq tag.
+- Explicitly require Safe::Hole and Set::Crontab, which the RPM dependency
+ checker misses.
+- Force use of /usr/lib, not /usr/lib64, on x86_64. We're not installing
+ binaries (except the cgi-bin which is in /var/www anyway) and many things
+ depend on the /usr/lib location.
+- Thanks to Richard Siddall <richard.siddall at elirion.net> for the following
+ changes:
+- Require Perl 5.8.8 or newer for build and installation to be compatible
+ with system threaded Perl.
+- Use interchange-* helper scripts directly from SPECS/ in source tarball,
+ instead of copying. Enables use of rpmbuild -ta directly on tarball.
+- Don't check for IniConf.pm anymore as it's part of dist/lib now.
+
* Thu Nov 10 2005 Jon Jensen <jon at icdevgroup.org> 5.3.2-1
- Update for 5.3.2 release.
No revision
No revision
1.17.2.2 interchange/dist/standard/products/mv_metadata.asc
rev 1.17.2.2, prev_rev 1.17.2.1
Index: mv_metadata.asc
===================================================================
RCS file: /var/cvs/interchange/dist/standard/products/mv_metadata.asc,v
retrieving revision 1.17.2.1
retrieving revision 1.17.2.2
diff -u -u -r1.17.2.1 -r1.17.2.2
--- mv_metadata.asc 21 May 2008 00:15:31 -0000 1.17.2.1
+++ mv_metadata.asc 10 Nov 2008 06:51:21 -0000 1.17.2.2
@@ -281,7 +281,7 @@
transactions::deleted yesno Deleted
transactions::order_id text 32 Order ID
transactions::status select pending=Pending, shipped=Shipped, partial=Partially shipped, backorder=Back ordered, waiting=Waiting for payment, credit=Waiting for credit check, canceled=Canceled nullselect
-ui-version 5.6.0
+ui-version 5.6.1
ui_component::mv_metadata table ui_component mv_metadata {'ui_data_fields' => "=Main
code
label
default
type
width
height
options
filter
=Database lookup
lookup
field
db
=Help and misc
help
help_url
prepend
append
pre_filter",'table_width' => "80%",'left_width' => "30%",}
ui_component::mv_metadata::append textarea 60 5 Append HTML <SMALL>HTML to be appended to the widget.
Will substitute in the macros _UI_TABLE_, _UI_COLUMN_,
_UI_KEY, and _UI_VALUE_, and will resolve relative links
with absolute links.</SMALL>
ui_component::mv_metadata::attribute text 20 Column name Do not set this.
No revision
No revision
2.105.2.2 interchange/scripts/interchange.PL
rev 2.105.2.2, prev_rev 2.105.2.1
Index: interchange.PL
===================================================================
RCS file: /var/cvs/interchange/scripts/interchange.PL,v
retrieving revision 2.105.2.1
retrieving revision 2.105.2.2
diff -u -u -r2.105.2.1 -r2.105.2.2
--- interchange.PL 21 May 2008 00:15:31 -0000 2.105.2.1
+++ interchange.PL 10 Nov 2008 06:51:21 -0000 2.105.2.2
@@ -1,9 +1,9 @@
#!/usr/bin/perl -w
##!~_~perlpath~_~
#
-# Interchange version 5.6.0
+# Interchange version 5.6.1
#
-# $Id: interchange.PL,v 2.105.2.1 2008-05-21 00:15:31 jon Exp $
+# $Id: interchange.PL,v 2.105.2.2 2008-11-10 06:51:21 jon Exp $
#
# Copyright (C) 2002-2008 Interchange Development Group
# Copyright (C) 1996-2002 Red Hat, Inc.
@@ -155,7 +155,7 @@
require Exporter;
BEGIN {
- $VERSION = '5.6.0';
+ $VERSION = '5.6.1';
}
use Fcntl;
@@ -361,7 +361,7 @@
=head1 VERSION
-5.6.0
+5.6.1
=head1 DESCRIPTION
More information about the interchange-cvs
mailing list