OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 10-Jul-2006 12:09:38
Branch: HEAD Handle: 2006071011093700
Modified files:
openpkg-src/openpkg-registry
openpkg-registry.spec
Log:
upgrading package: openpkg-registry 0.5.0 -> 0.5.1
Summary:
Revision Changes Path
1.15 +18 -6 openpkg-src/openpkg-registry/openpkg-registry.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg-registry/openpkg-registry.spec
============================================================================
$ cvs diff -u -r1.14 -r1.15 openpkg-registry.spec
--- openpkg-src/openpkg-registry/openpkg-registry.spec 4 Jul 2006
14:26:17 -0000 1.14
+++ openpkg-src/openpkg-registry/openpkg-registry.spec 10 Jul 2006
10:09:37 -0000 1.15
@@ -32,8 +32,8 @@
Class: EVAL
Group: Bootstrapping
License: BSD-style
-Version: 0.5.0
-Release: 20060704
+Version: 0.5.1
+Release: 20060710
# package options
%option with_client yes
@@ -54,6 +54,7 @@
PreReq: apache::with_mod_perl
PreReq: perl-www >= perl-www-5.8.7-20051031
PreReq: perl-xml
+PreReq: cfg::with_perl
# PreReq: ase FIXME production
%endif
AutoReq: no
@@ -109,7 +110,15 @@
%{l_shtool} install -c -m 755 %{l_value -s -a} \
registry-db.pl \
$RPM_BUILD_ROOT%{l_prefix}/sbin/openpkg-registry-setup
- # FIXME development
+ ( echo "##"
+ echo "## registry-ui.cfg - OpenPKG Registry User Interface
Configuration"
+ echo "##"
+ echo "## Run ( cd %{l_prefix}/cgi/openpkg-registry &&
./registry-ui-.pl )"
+ echo "## to review defaults in OSSP cfg syntax. This file has exactly
the same syntax."
+ echo "## Only overrides need to be placed here, missing config
directives remain default."
+ echo "##"
+ ) >$RPM_BUILD_ROOT%{l_prefix}/etc/openpkg-registry/registry-ui.cfg
+ # FIXME development, also causes "( cd && ./ ...)" construct few lines
above
%{l_shtool} install -c -m 755 %{l_value -s -a} \
ase.pm \
$RPM_BUILD_ROOT%{l_prefix}/cgi/openpkg-registry/
@@ -119,6 +128,8 @@
%if "%{with_server}" == "yes"
'%attr(700,%{l_rusr},%{l_rgrp}) %dir
%{l_prefix}/var/openpkg-registry/db' \
'%attr(775,%{l_musr},%{l_ngrp}) %dir
%{l_prefix}/var/openpkg-registry/ui' \
+ '%attr(640,%{l_musr},%{l_ngrp}) %dir
%{l_prefix}/etc/openpkg-registry/registry-ui.cfg' \
+ '%config %{l_prefix}/etc/openpkg-registry/registry-ui.cfg' \
%endif
'%ghost %{l_prefix}/etc/openpkg/register.util' \
'%ghost %{l_prefix}/etc/openpkg/register.tran' \
@@ -134,8 +145,9 @@
%post
if [ $1 -eq 1 ]; then
# display final hints on initial installation
- ( echo "1. To complete this installation of OpenPKG Registry please
start PostgreSQL and"
- echo " initialize the OpenPKG Registry database like this:"
+ ( echo "1. To complete this installation of OpenPKG Registry please
configure it,"
+ echo " start PostgreSQL and initialize the OpenPKG Registry
database like this:"
+ echo " \$ vi
$RPM_INSTALL_PREFIX/etc/openpkg-registry/registry-ui.cfg"
echo " # $RPM_INSTALL_PREFIX/etc/rc postgresql start"
echo " \$ $RPM_INSTALL_PREFIX/sbin/openpkg-registry-setup"
echo ""
@@ -148,7 +160,7 @@
fi
if [ $1 -eq 2 ]; then
# display final hints on update installation
- ( echo "Please perform a OpenPKG Registry database upgrade by
running"
+ ( echo "Please perform an OpenPKG Registry database upgrade by
running"
echo " \$ $RPM_INSTALL_PREFIX/sbin/openpkg-registry-setup"
) | %{l_rpmtool} msg -b -t notice
fi
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
