[elektra] Remove bash-ism in elektraenv.sh
Nicolas Chauvet
kwizart at fedoraproject.org
Thu Mar 17 14:26:07 UTC 2011
commit 21dba2fc4529182eec306fab3dafad02e53aa6ee
Author: Nicolas Chauvet <kwizart at gmail.com>
Date: Thu Mar 17 15:25:45 2011 +0100
Remove bash-ism in elektraenv.sh
elektra-0.7.0-no_local.patch | 17 +++++++++++++++++
elektra.spec | 15 ++++++---------
2 files changed, 23 insertions(+), 9 deletions(-)
---
diff --git a/elektra-0.7.0-no_local.patch b/elektra-0.7.0-no_local.patch
new file mode 100644
index 0000000..7d55e72
--- /dev/null
+++ b/elektra-0.7.0-no_local.patch
@@ -0,0 +1,17 @@
+diff -up elektra-0.7.0/scripts/elektraenv.sh.local elektra-0.7.0/scripts/elektraenv.sh
+--- elektra-0.7.0/scripts/elektraenv.sh.local 2011-03-17 12:46:52.265269003 +0100
++++ elektra-0.7.0/scripts/elektraenv.sh 2011-03-17 15:22:31.531268999 +0100
+@@ -43,9 +43,9 @@ FILE="`mktemp -t elektraenv.XXXXXXXXX`"
+
+
+ readEnvTree() {
+- local keysAvailable=0
+- local stage=0
+- local key
++ keysAvailable=0
++ stage=0
++ key=""
+
+ for stage in 1 2 3; do
+ echo "# Stage $stage"
+
diff --git a/elektra.spec b/elektra.spec
index 88d7c58..5d028f3 100644
--- a/elektra.spec
+++ b/elektra.spec
@@ -1,12 +1,13 @@
Summary: A key/value pair database to store software configurations
Name: elektra
Version: 0.7.0
-Release: 5%{?dist}
+Release: 6%{?dist}
Group: System Environment/Libraries
License: BSD
URL: http://www.libelektra.org
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Patch0: elektra-0.7.0-rename.patch
+Patch1: elektra-0.7.0-no_local.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# doxygen: to build the API documentation
# libxslt, docbook-style-xsl: to build man pages from docbook with xsltproc program
@@ -57,17 +58,10 @@ create elektrified programs.
-# GConf2-devel: for the testing GConf2 backend for Elektra
-
-#%description backend-gconf
-
-#This package contains a GConf backend for Elektra, to let Elektra use a GConf
-#daemon to store its keys.
-
-
%prep
%setup -q
%patch0 -p1 -b .rename
+%patch1 -p1 -b .local
@@ -189,6 +183,9 @@ elektra-kdb set system/sw/kdb/schemapath "%{_datadir}/sgml/elektra-%{version}/el
%changelog
+* Thu Mar 17 2011 Nicolas Chauvet <kwizart at gmail.com> - 0.7.0-6
+- Remove local bash-ism in elektraenv.sh
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
More information about the scm-commits
mailing list