r15 - tools/scripts/trunk/pkg/dist

[Dennis Gregorovic <dgregoro@xxxxxxxxxxxxxxxxxxxxxxxxx>]

Author: dgregoro
Date: 2004-09-08 07:28:51 +0200 (Wed, 08 Sep 2004)
New Revision: 15

Modified:
   tools/scripts/trunk/pkg/dist/rpm.spec.java-standalone.in
Log:
fix symlink issue

Modified: tools/scripts/trunk/pkg/dist/rpm.spec.java-standalone.in
===================================================================
--- tools/scripts/trunk/pkg/dist/rpm.spec.java-standalone.in    2004-09-02 
19:24:02 UTC (rev 14)
+++ tools/scripts/trunk/pkg/dist/rpm.spec.java-standalone.in    2004-09-08 
05:28:51 UTC (rev 15)
@@ -106,21 +106,28 @@
     done
 fi
 
+if [ -d "%{buildroot}%{webappdir}" ]; then
+  cd "%{buildroot}%{webappdir}"
+  ln -sf %{name}-%{appversion} %{name}
+  if [ "%{version}" != "%{appversion}" ]; then
+    ln -sf %{name}-%{version} %{name}-%{appversion}
+  fi
+fi
+
 if [ -n "$AUTO_BUILD_ROOT" ]; then
   mkdir -p $AUTO_BUILD_ROOT/usr/share/java
   cp -vrf --preserve=all %{buildroot}/* $AUTO_BUILD_ROOT
 fi
 
 rm -f "$RPM_BUILD_DIR/%{name}-%{appversion}/filelist.rpm"
-find "%{buildroot}%{sharedjardir}" -mindepth 1 -print -prune 2>/dev/null | \
+
+find "%{buildroot}%{sharedjardir}" -mindepth 1 -maxdepth 1 -name "%{name}*" 
-print 2>/dev/null | \
   sed "s!%{buildroot}!!" >> 
"$RPM_BUILD_DIR/%{name}-%{appversion}/filelist.rpm"
-find "%{buildroot}%{webappdir}" -mindepth 1 -print -prune 2>/dev/null | \
+find "%{buildroot}%{webappdir}" -mindepth 1 -maxdepth 1 -name "%{name}*" 
-print 2>/dev/null | \
   sed "s!%{buildroot}!!" >> 
"$RPM_BUILD_DIR/%{name}-%{appversion}/filelist.rpm"
-find "%{buildroot}%{_bindir}" -mindepth 1 -print -prune 2>/dev/null | \
+find "%{buildroot}%{_bindir}" -mindepth 1 -maxdepth 1 -print 2>/dev/null | \
   sed "s!%{buildroot}!!" >> 
"$RPM_BUILD_DIR/%{name}-%{appversion}/filelist.rpm"
 
-
-
 %post
 if [ -d "%{webappdir}/%{name}-%{appversion}" ]; then
    mkdir -p "%{webappdir}/%{name}-%{appversion}/WEB-INF/lib"