OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 25-Apr-2005 19:36:46
Branch: HEAD Handle: 2005042518364600
Modified files:
openpkg-src/j2ee j2ee.spec
Log:
move and remove more leftover installation files, correct spelling
Summary:
Revision Changes Path
1.29 +10 -5 openpkg-src/j2ee/j2ee.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/j2ee/j2ee.spec
============================================================================
$ cvs diff -u -r1.28 -r1.29 j2ee.spec
--- openpkg-src/j2ee/j2ee.spec 21 Apr 2005 16:34:51 -0000 1.28
+++ openpkg-src/j2ee/j2ee.spec 25 Apr 2005 17:36:46 -0000 1.29
@@ -40,7 +40,7 @@
Group: Language
License: Commercial
Version: %{V_openpkg}
-Release: 20050421
+Release: 20050425
# package options
%option with_docs no
@@ -185,10 +185,15 @@
fi
) || exit $?
- # remove leftover installation state file
+ # move and remove leftover residue
rm -f $RPM_BUILD_ROOT/j2ee.state
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/libexec/*.txt
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/libexec/setup
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/libexec/package
+ mv $RPM_BUILD_ROOT%{l_prefix}/libexec/appserv.class \
+ $RPM_BUILD_ROOT%{l_prefix}/libexec/j2ee
- # activate and correct hardcoded configure paths in binaries
+ # activate and correct hard coded configure paths in binaries
( cd $RPM_BUILD_ROOT%{l_prefix}/bin
for bin in appclient asadmin asant asupgrade capture-schema deploytool
\
jspc package-appclient uninstall verifier wscompile
wsdeploy; do
@@ -198,7 +203,7 @@
done
) || exit $?
- # correct hardcoded configure paths in config file
+ # correct hard coded configure paths in config file
%{l_shtool} subst \
-e "s;$RPM_BUILD_ROOT;;" \
-e "s;\(AS_PERL=\"\).*$;\1%{l_prefix}/bin/perl/nodependency\";" \
@@ -218,7 +223,7 @@
) || exit $?
%endif
- # install runcommand script
+ # install run command script
%{l_shtool} install -c -m 755 %{l_value -s -a} \
%{SOURCE rc.j2ee} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
