rpms/elektra/EL-5 elektra-0.6.10-open.patch, NONE, 1.1 elektra.spec, 1.1, 1.2

[Patrice Dumas (pertusus)]

Author: pertusus

Update of /cvs/extras/rpms/elektra/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21146

Modified Files:
	elektra.spec 
Added Files:
	elektra-0.6.10-open.patch 
Log Message:
sync with devel

elektra-0.6.10-open.patch:

--- NEW FILE elektra-0.6.10-open.patch ---
diff -up elektra-0.6.10/src/backends/berkeleydb/berkeleydb.c.open elektra-0.6.10/src/backends/berkeleydb/berkeleydb.c
--- elektra-0.6.10/src/backends/berkeleydb/berkeleydb.c.open	2007-03-08 12:58:41.000000000 +0100
+++ elektra-0.6.10/src/backends/berkeleydb/berkeleydb.c	2007-08-25 15:59:39.000000000 +0200
@@ -509,14 +509,14 @@ DBTree *dbTreeNew(KDBHandle handle,const
 		errno=KDB_RET_EBACKEND;
 		return 0;
 	}
-	ret=newDB->db.keyValuePairs->open(newDB->db.keyValuePairs,NULL,keyvalueFile,
+	ret=(newDB->db.keyValuePairs->open)(newDB->db.keyValuePairs,NULL,keyvalueFile,
 		DB_KEYVALUE, DB_BTREE, DB_CREATE | DB_EXCL | DB_THREAD, 0);
 	if (ret == EEXIST || ret == EACCES) {
 		/* DB already exist. Only open it */
-		ret=newDB->db.keyValuePairs->open(newDB->db.keyValuePairs,NULL, keyvalueFile,
+		ret=(newDB->db.keyValuePairs->open)(newDB->db.keyValuePairs,NULL, keyvalueFile,
 			DB_KEYVALUE, DB_BTREE, DB_THREAD, 0);
 		if (ret == EACCES)
-			ret=newDB->db.keyValuePairs->open(newDB->db.keyValuePairs,NULL,
+			ret=(newDB->db.keyValuePairs->open)(newDB->db.keyValuePairs,NULL,
 				keyvalueFile, DB_KEYVALUE, DB_BTREE, DB_THREAD | DB_RDONLY, 0);
 	} else newlyCreated=1;
 
@@ -548,14 +548,14 @@ DBTree *dbTreeNew(KDBHandle handle,const
 		DB_DUP | DB_DUPSORT);
 	if (ret != 0) fprintf(stderr, "set_flags: %s: %d\n",DB_PARENTINDEX,ret);
 	
-	ret = newDB->db.parentIndex->open(newDB->db.parentIndex,
+	ret = (newDB->db.parentIndex->open)(newDB->db.parentIndex,
 		NULL, parentsFile, DB_PARENTINDEX, DB_BTREE, DB_CREATE | DB_EXCL | DB_THREAD, 0);
 	if (ret == EEXIST || ret == EACCES) {
 		/* DB already exist. Only open it */
-		ret=newDB->db.parentIndex->open(newDB->db.parentIndex,NULL, parentsFile,
+		ret=(newDB->db.parentIndex->open)(newDB->db.parentIndex,NULL, parentsFile,
 			DB_PARENTINDEX, DB_BTREE, DB_THREAD, 0);
 		if (ret == EACCES)
-			ret=newDB->db.parentIndex->open(newDB->db.parentIndex,NULL,
+			ret=(newDB->db.parentIndex->open)(newDB->db.parentIndex,NULL,
 				parentsFile, DB_PARENTINDEX, DB_BTREE, DB_THREAD | DB_RDONLY, 0);
 	}
 	


Index: elektra.spec
===================================================================
RCS file: /cvs/extras/rpms/elektra/EL-5/elektra.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- elektra.spec	26 Mar 2007 01:31:48 -0000	1.1
+++ elektra.spec	18 Dec 2007 00:08:14 -0000	1.2
@@ -1,18 +1,21 @@
 Summary:       A key/value pair database to store software configurations
 Name:          elektra
 Version:       0.6.10
-Release:       2%{?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.6.10-nostart.patch
+Patch1:        elektra-0.6.10-open.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
 # db4-devel: for the Berkeley DB backend
 # libxml2-devel: for the kdbtools library build
 BuildRequires: doxygen db4-devel libxml2-devel docbook-style-xsl libxslt
+# gawk is used in src/libelektra/exportobjects.sh
+BuildRequires: gawk
 # gettext-devel: for the autoconf ICONV macro only
 
 Requires(post): /sbin/ldconfig
@@ -61,6 +64,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .nostart
+%patch1 -p1 -b .open
 
 %build
 %configure \
@@ -83,15 +87,19 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=$RPM_BUILD_ROOT install INSTALL='install -p'
 
 # Remove statically linked kdb - lib
 rm $RPM_BUILD_ROOT%{_bindir}/elektra-kdb_static
 rm $RPM_BUILD_ROOT%{_libdir}/libelektra.a
 
-# file in profile.d is sourced, remove shebang and execute bits
+# file in profile.d is sourced, remove shebang and execute bits,
+# while keeping timestamps
+touch -r $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/elektra-elektraenv.sh __elektra-elektraenv_timestamp
 sed -i -e 's;#!/bin/sh;;' $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/elektra-elektraenv.sh
 chmod a-x $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/elektra-elektraenv.sh
+touch -r __elektra-elektraenv_timestamp $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/elektra-elektraenv.sh
+rm __elektra-elektraenv_timestamp
 
 #Fix symlink should be relative - Be aware of SONAME changes!
 ln -fs ../libelektratools.so.1  $RPM_BUILD_ROOT%{_libdir}/elektra/libelektratools.so
@@ -170,6 +178,14 @@
 
 
 %changelog
+* Mon Dec 17 2007 Patrice Dumas <pertusus at free.fr> 0.6.10-6
+- keep some timestamps. Many are not kept since some files
+  are generated, and install-sh is used for others (with nobase_)
+
+* Sat Aug 25 2007 Patrice Dumas <pertusus at free.fr> 0.6.10-5
+- protect ->open calls
+- add gawk BuildRequires
+
 * Mon Mar 12 2007 kwizart < kwizart at gmail.com > - 0.6.10-2
 - Disable static packages