rpms/ice/devel Ice-3.3.0-use-db4.7.patch, NONE, 1.1 ice.spec, 1.17, 1.18

[Mary Ellen Foster (mef)]

Author: mef

Update of /cvs/pkgs/rpms/ice/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6246

Modified Files:
	ice.spec 
Added Files:
	Ice-3.3.0-use-db4.7.patch 
Log Message:
Added stuff so it builds in rawhide

Ice-3.3.0-use-db4.7.patch:

--- NEW FILE Ice-3.3.0-use-db4.7.patch ---
--- Ice-3.3.0/cpp/src/Freeze/SharedDbEnv.cpp.orig	2008-08-08 14:57:10.000000000 +0200
+++ Ice-3.3.0/cpp/src/Freeze/SharedDbEnv.cpp	2008-08-08 14:57:32.000000000 +0200
@@ -506,7 +506,7 @@
                 
             if(autoDelete)
             {
-                _env->set_flags(DB_LOG_AUTOREMOVE, 1);
+                _env->log_set_config(DB_LOG_AUTO_REMOVE, 1);
             }
             
             //


Index: ice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ice/devel/ice.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ice.spec	30 Jul 2008 15:43:26 -0000	1.17
+++ ice.spec	12 Aug 2008 12:50:55 -0000	1.18
@@ -4,7 +4,7 @@
 
 Name: ice
 Version: 3.3.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: The Ice base runtime and services
 
 Group: System Environment/Libraries
@@ -23,6 +23,7 @@
 Patch3:         Ice-3.3.0-java-Timer.patch
 # From http://www.zeroc.com/forums/patches/3798-patch-1-ice-3-3-0-fix-slice2cpp-slice2freeze.html
 Patch4:         Ice-3.3.0-fix-slice2cpp-slice2freeze.patch
+Patch5:         Ice-3.3.0-use-db4.7.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Ice doesn't officially support this architecture at all
@@ -163,6 +164,9 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%if 0%{?fedora} >= 10
+%patch5 -p1
+%endif
 %setup -q -n Ice-rpmbuild-%{version} -T -b 1
 %setup -q -n Ice-%{version}-man-pages -T -b 2
 
@@ -189,6 +193,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT
 
 # Do the basic "make install"
 cd $RPM_BUILD_DIR/Ice-%{version}
@@ -523,6 +528,10 @@
 %config(noreplace) %{_sysconfdir}/php.d/ice.ini
 
 %changelog
+* Tue Aug 12 2008 Mary Ellen Foster <mefoster at gmail.com> 3.3.0-5
+- Explicitly create build root so it builds on F10
+- Patch to build against DB4.7
+
 * Wed Jul 30 2008 Mary Ellen Foster <mefoster at gmail.com> 3.3.0-4
 - Re-add .pth file -- the alternative method involves editing auto-generated
   files that say "don't edit" and I don't want to break other parts of Ice