]> git.pld-linux.org Git - packages/jpackage-utils.git/blob - jpackage-utils-pdksh.patch
- added %{_javasrcdir}
[packages/jpackage-utils.git] / jpackage-utils-pdksh.patch
1 --- jpackage-utils-1.6.6/java-utils/java-functions      2006-05-19 15:20:00.000000000 +0200
2 +++ jpackage-utils-1.6.6/java-utils/java-functions      2007-04-19 20:46:06.076850536 +0300
3 @@ -146,7 +146,7 @@
4          # Yuck, "grep -o" would be cleaner, but requires GNU grep >= 2.5.
5          # This could be improved/simplified if sed had non-greedy matching.
6          JAVA_VERSION=$($JAVACMD $opt 2>&1 | sed -n \
7 -            -e '/java \(full \)*version "/s/'$re'/<<<\1>>>/' \
8 +            -e '/java \(full \)*version "/s/'"$re"'/<<<\1>>>/' \
9              -e '/java \(full \)*version "/s/.*<<<\([^>]\{1,\}\)>>>.*/\1/p')
10          if [ -n "$JAVA_VERSION" ] ; then
11              break
12 @@ -217,7 +217,7 @@
13     [ -z "$_LINK_CMD" ] && _LINK_CMD="/bin/ln -fs"
14     extension_list="$extension_list $@"
15  
16 -   pushd $repository > /dev/null
17 +   cd $repository > /dev/null
18        _ALLFOUND=0
19        for extension in $extension_list ; do
20           extension=$(echo $extension | sed 's+/$++g' | sed 's+\.jar$++g')
21 @@ -244,7 +244,7 @@
22              _ALLFOUND=1
23           fi
24        done
25 -   popd $repository > /dev/null
26 +   cd -> /dev/null
27     return $_ALLFOUND
28  }
29  
30 --- jpackage-utils-1.7.3/bin/find-jar~  2006-09-19 22:55:46.000000000 +0300
31 +++ jpackage-utils-1.7.3/bin/find-jar   2007-12-11 18:39:55.237824072 +0200
32 @@ -30,7 +30,7 @@
33  find_jar $1
34  
35  if [ $? != 0 ]; then
36 -   echo $"Could not find the requested jar or jar directory." >&2
37 -   echo $"Please check the correct JAVA_HOME is set." >&2
38 +   echo "Could not find the requested jar or jar directory." >&2
39 +   echo "Please check the correct JAVA_HOME is set." >&2
40     exit 6
41  fi
This page took 0.04595 seconds and 3 git commands to generate.