Hello community,
here is the log from the commit of package tulip for openSUSE:Factory checked
in at 2014-11-11 01:10:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/tulip (Old)
and /work/SRC/openSUSE:Factory/.tulip.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tulip"
Changes:
--------
--- /work/SRC/openSUSE:Factory/tulip/tulip.changes 2014-02-12
11:09:08.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.tulip.new/tulip.changes 2014-11-11
01:11:47.000000000 +0100
@@ -1,0 +2,7 @@
+Sun Oct 19 19:03:00 UTC 2014 - Led <led...@gmail.com>
+
+- fix bashisms
+- add patches:
+ * tulip-3.7.0-src-fix-bashisms.patch
+
+-------------------------------------------------------------------
New:
----
tulip-3.7.0-src-fix-bashisms.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ tulip.spec ++++++
--- /var/tmp/diff_new_pack.9l3jjD/_old 2014-11-11 01:11:50.000000000 +0100
+++ /var/tmp/diff_new_pack.9l3jjD/_new 2014-11-11 01:11:50.000000000 +0100
@@ -44,6 +44,7 @@
# with ftgl-devel
Patch8: tulip-system-ftgl.patch
Patch9: tulip-cmake-2.8.12.patch
+Patch10: tulip-3.7.0-src-fix-bashisms.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: Mesa-devel
BuildRequires: cmake
@@ -208,6 +209,7 @@
# For cmake >= 2.8.12
%patch9
%endif
+%patch10 -p1
%build
++++++ tulip-3.7.0-src-fix-bashisms.patch ++++++
diff -Ndurp tulip-3.7.0-src/docs/developerHandbook/gen-devPdf.sh.in
tulip-3.7.0-src-fix-bashisms/docs/developerHandbook/gen-devPdf.sh.in
--- tulip-3.7.0-src/docs/developerHandbook/gen-devPdf.sh.in 2012-02-21
13:23:30.000000000 +0200
+++ tulip-3.7.0-src-fix-bashisms/docs/developerHandbook/gen-devPdf.sh.in
2014-10-19 21:57:11.335523348 +0300
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# first ensure that pdf directory exits
if [ ! -d pdf ]; then
diff -Ndurp tulip-3.7.0-src/docs/gen-tulipqhp.sh
tulip-3.7.0-src-fix-bashisms/docs/gen-tulipqhp.sh
--- tulip-3.7.0-src/docs/gen-tulipqhp.sh 2012-02-21 13:23:30.000000000
+0200
+++ tulip-3.7.0-src-fix-bashisms/docs/gen-tulipqhp.sh 2014-10-19
21:55:16.721531102 +0300
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
if [ $# -eq 0 ]; then
QHP=tulip.qhp
else
diff -Ndurp tulip-3.7.0-src/docs/make_tulip_doc_tarball.sh.in
tulip-3.7.0-src-fix-bashisms/docs/make_tulip_doc_tarball.sh.in
--- tulip-3.7.0-src/docs/make_tulip_doc_tarball.sh.in 2012-02-21
13:23:30.000000000 +0200
+++ tulip-3.7.0-src-fix-bashisms/docs/make_tulip_doc_tarball.sh.in
2014-10-19 21:56:27.463526316 +0300
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# This script intends to create a tarball of html
# generated docs
diff -Ndurp tulip-3.7.0-src/docs/userHandbook/gen-userPdf.sh.in
tulip-3.7.0-src-fix-bashisms/docs/userHandbook/gen-userPdf.sh.in
--- tulip-3.7.0-src/docs/userHandbook/gen-userPdf.sh.in 2012-02-21
13:23:30.000000000 +0200
+++ tulip-3.7.0-src-fix-bashisms/docs/userHandbook/gen-userPdf.sh.in
2014-10-19 21:56:14.843527170 +0300
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# first ensure that pdf directory exits
if [ ! -d pdf ]; then
@@ -9,4 +9,4 @@ fi
java -cp
"@PROJECT_SOURCE_DIR@/thirdparty/saxon/saxon653.jar:@PROJECT_SOURCE_DIR@/thirdparty/saxon/saxon.jar:@PROJECT_SOURCE_DIR@/docs/common:${PROJECT_SOURCE_DIR}/thirdparty/xml-commons/resolver.jar"
com.icl.saxon.StyleSheet -x org.apache.xml.resolver.tools.ResolvingXMLReader
-y org.apache.xml.resolver.tools.ResolvingXMLReader -r
org.apache.xml.resolver.tools.CatalogResolver -u -o pdf/userManual.fo
@PROJECT_SOURCE_DIR@/docs/userHandbook/index.docbook
@PROJECT_SOURCE_DIR@/docs/common/tulip-pdf.xsl
# finally generate pdf/userManual.pdf
-pdfxmltex --output-directory="pdf/" pdf/userManual.fo
\ No newline at end of file
+pdfxmltex --output-directory="pdf/" pdf/userManual.fo
diff -Ndurp tulip-3.7.0-src/get_package_changelog.sh
tulip-3.7.0-src-fix-bashisms/get_package_changelog.sh
--- tulip-3.7.0-src/get_package_changelog.sh 2012-02-21 13:23:31.000000000
+0200
+++ tulip-3.7.0-src-fix-bashisms/get_package_changelog.sh 2014-10-19
21:51:57.055544609 +0300
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
echo "Enter package changelog :"
changelog=""
diff -Ndurp tulip-3.7.0-src/get_package_type.sh
tulip-3.7.0-src-fix-bashisms/get_package_type.sh
--- tulip-3.7.0-src/get_package_type.sh 2012-02-21 13:23:31.000000000 +0200
+++ tulip-3.7.0-src-fix-bashisms/get_package_type.sh 2014-10-19
21:54:59.502532267 +0300
@@ -1,15 +1,11 @@
-#!/bin/bash
+#!/bin/sh
echo "Is package to upload a svn snapshot or a release ?"
echo -n "Enter 1 for a svn snapshot or 2 for a release : "
read package_type
-if [ "$package_type" == "1" ]
-then
- echo -n snapshot 1>&2
-elif [ "$package_type" == "2" ]
-then
- echo -n release 1>&2
-fi
-
+case "$package_type" in
+ 1) echo -n snapshot 1>&2 ;;
+ 2) echo -n release 1>&2 ;;
+esac
diff -Ndurp tulip-3.7.0-src/make_tulip_linux_bundle.sh.in
tulip-3.7.0-src-fix-bashisms/make_tulip_linux_bundle.sh.in
--- tulip-3.7.0-src/make_tulip_linux_bundle.sh.in 2012-02-21
13:23:35.000000000 +0200
+++ tulip-3.7.0-src-fix-bashisms/make_tulip_linux_bundle.sh.in 2014-10-19
21:53:11.069539602 +0300
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# This script is Linux specific:
# it intends to create a tulip bundle
@@ -39,9 +39,9 @@ echo @prefix@/share copied in $BUNDLE_DI
rm $BUNDLE_BIN_DIR/tulip-config
rm $BUNDLE_DIR/share/tulip/Find*.*
-function copy_linked_lib() {
+copy_linked_lib() {
LIB_TO_COPY=$(ldd $2 | grep $1 | awk '{print $3}')
- if [ "$LIB_TO_COPY" == "" ]; then
+ if [ -z "$LIB_TO_COPY" ]; then
tput setaf 1
tput bold
echo no library found for $1
diff -Ndurp
tulip-3.7.0-src/software/plugins-manager/server/src/copy_plugin_libs.sh.in
tulip-3.7.0-src-fix-bashisms/software/plugins-manager/server/src/copy_plugin_libs.sh.in
--- tulip-3.7.0-src/software/plugins-manager/server/src/copy_plugin_libs.sh.in
2012-02-21 13:23:37.000000000 +0200
+++
tulip-3.7.0-src-fix-bashisms/software/plugins-manager/server/src/copy_plugin_libs.sh.in
2014-10-19 21:58:26.601518256 +0300
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
if [ $# -lt 3 ]; then
echo "--- $(basename $0) allows to copy all plugin libraries, found in"
echo " a hierachy of build plugins, in an already existing list of"
@@ -33,4 +33,3 @@ do
cp $PLUGIN_LIB $PLUGIN_DIR/$ARCH
fi
done
-
diff -Ndurp
tulip-3.7.0-src/software/plugins-manager/server/src/generate_plugin_dirs.sh.in
tulip-3.7.0-src-fix-bashisms/software/plugins-manager/server/src/generate_plugin_dirs.sh.in
---
tulip-3.7.0-src/software/plugins-manager/server/src/generate_plugin_dirs.sh.in
2012-02-21 13:23:37.000000000 +0200
+++
tulip-3.7.0-src-fix-bashisms/software/plugins-manager/server/src/generate_plugin_dirs.sh.in
2014-10-19 21:57:49.150520790 +0300
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
if [ $# -lt 4 ]; then
echo "usage: $(basename $0) plugins_src_top_dir plugins_build_top_dir
plugins_server_dir generate_doc(yes/no) arch"
exit
@@ -28,7 +28,7 @@ for LIB in $(find $BUILD_TOP_DIR -name '
do
GEN_DOC=no
FILE_XML=none
-if [ "$GENERATEDOC" == "yes" ]; then
+if [ "$GENERATEDOC" = "yes" ]; then
LIB_DIR=$(dirname $LIB)
DIR=$(basename $LIB_DIR)
SRC_DIR=$(find $1 -path "*/$DIR" -print)
diff -Ndurp tulip-3.7.0-src/thirdparty/libgpugraph/glsl_to_cpp.sh
tulip-3.7.0-src-fix-bashisms/thirdparty/libgpugraph/glsl_to_cpp.sh
--- tulip-3.7.0-src/thirdparty/libgpugraph/glsl_to_cpp.sh 2012-02-21
13:23:38.000000000 +0200
+++ tulip-3.7.0-src-fix-bashisms/thirdparty/libgpugraph/glsl_to_cpp.sh
2014-10-19 21:56:37.845525614 +0300
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# first remove comments
#sed -n '/\/\//!p' $1 > $1.tmp
diff -Ndurp tulip-3.7.0-src/tulip-config.in
tulip-3.7.0-src-fix-bashisms/tulip-config.in
--- tulip-3.7.0-src/tulip-config.in 2012-02-21 13:23:44.000000000 +0200
+++ tulip-3.7.0-src-fix-bashisms/tulip-config.in 2014-10-19
21:51:28.168546564 +0300
@@ -37,7 +37,7 @@ if [ $WINNT -eq 0 ] ; then
if [ -f "$thisdir/../Uninstall.exe" ] ; then
# Windows installation
drive=`echo ${thisdir} | awk -F / '{print $2}'`
- ndir=${thisdir/\/$drive\//$drive:/}
+ ndir="$(echo "$thisdir" | sed "s|/$drive/|$drive:/|")"
if [ -d ${ndir} ]; then
thisdir=${ndir}
fi
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
