Accepting request 262582 from devel:tools

1

OBS-URL: https://build.opensuse.org/request/show/262582
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cscope?expand=0&rev=25

cscope-15.8a-fix-bashisms.patch

@@ -0,0 +1,37 @@
+diff -Ndurp cscope-15.8a/contrib/ocs cscope-15.8a-fix-bashisms/contrib/ocs
+--- cscope-15.8a/contrib/ocs	2010-06-29 01:16:40.000000000 +0300
++++ cscope-15.8a-fix-bashisms/contrib/ocs	2014-10-19 19:16:03.210177402 +0300
+@@ -168,7 +168,8 @@ create_list()
+ 
+ 	if [ "${FORCE}" != "Y" ]
+ 	then
+-	    echo "\n${LIST}"
++	    echo
++	    echo "$LIST"
+ 	    echo "Update the library? <(Y)es, (N)o, (Q)uit> [n] \c"
+ 	    read x y
+ 	    case $x in
+@@ -177,10 +178,11 @@ create_list()
+ 		*)	return	;;
+ 	    esac
+ 	fi
+-	echo "Updating library:\n  ${LIST} \c"
++	echo "Updating library:"
+     else
+-	echo "Creating library:\n  ${LIST} \c"
++	echo "Creating library:"
+     fi
++    echo -n "  ${LIST} "
+ 
+     (
+ 	find . -follow -type f \( -name \*.[sScChHlyG] -o \
+@@ -197,7 +199,8 @@ create_list()
+ 				  -print
+    ) | grep -v SCCS | sort -u > ${LIST}
+ 
+-    echo "\n`cat ${LIST} | wc -l` files listed"
++    echo
++    echo "`cat ${LIST} | wc -l` files listed"
+ }
+ 
+ #

cscope.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Nov 20 21:31:00 UTC 2014 - Led <ledest@gmail.com>
+
+- fix bashisms in osc script
+- add patches:
+  * cscope-15.8a-fix-bashisms.patch
+
 -------------------------------------------------------------------
 Mon Sep  3 21:57:08 UTC 2012 - sleep_walker@suse.cz
 

cscope.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package cscope
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -27,6 +27,7 @@ Source:         %{name}-%{version}.tar.bz2
 Patch1:         %{name}-null.patch
 Patch2:         %{name}-15.7-gcc-warnings.patch
 Patch3:         %{name}-15.7-vpath.patch
+Patch4:         %{name}-15.8a-fix-bashisms.patch
 Patch5:         %{name}-cleanup_on_sigterm.patch
 Patch6:         %{name}-egrep.out.patch
 BuildRequires:  bison
@@ -43,6 +44,7 @@ browse through C source code files for specified elements of code.
 %patch1 -p1
 %patch2
 %patch3
+%patch4 -p1
 %patch5
 %patch6 -p1