rpms/ice/devel Ice-3.3.0-fix-slice2cpp-slice2freeze.patch, NONE, 1.1 ice.spec, 1.12, 1.13

[Mary Ellen Foster (mef)]

Author: mef

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

Modified Files:
	ice.spec 
Added Files:
	Ice-3.3.0-fix-slice2cpp-slice2freeze.patch 
Log Message:
Add patch from ZeroC

Ice-3.3.0-fix-slice2cpp-slice2freeze.patch:

--- NEW FILE Ice-3.3.0-fix-slice2cpp-slice2freeze.patch ---
diff -c -r -N Ice-3.3.0-orig/cpp/src/Slice/Util.cpp Ice-3.3.0/cpp/src/Slice/Util.cpp
*** Ice-3.3.0-orig/cpp/src/Slice/Util.cpp	Tue Jun 24 10:28:04 2008
--- Ice-3.3.0/cpp/src/Slice/Util.cpp	Tue Jun 24 10:44:19 2008
***************
*** 49,57 ****
              ++pos;
          }
      }
!     if(result[result.size() - 1] == '/') // Remove trailing '/'
      {
!         result.erase(result.size() - 1);
      }
      return result;
  }
--- 49,65 ----
              ++pos;
          }
      }
! 
!     if(result.size() > 1) // Remove trailing "/" or "/."
      {
!         if(result[result.size() - 1] == '/')
!         {
!             result.erase(result.size() - 1);
!         }
!         else if(result[result.size() - 2] == '/' && result[result.size() - 1] == '.')
!         {
!             result.erase(result.size() - (result.size() == 2 ? 1 : 2));
!         }
      }
      return result;
  }
***************
*** 159,164 ****
--- 167,181 ----
          }
      }
  
+     if(result == file)
+     {
+         //
+         // Don't return a full path if we couldn't reduce the given path, instead
+         // return the normalized given path.
+         //
+         result = normalizePath(orig);
+     }
+ 
      string::size_type pos;
      if((pos = result.rfind('.')) != string::npos)
      {


Index: ice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ice/devel/ice.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ice.spec	9 Jun 2008 15:29:56 -0000	1.12
+++ ice.spec	25 Jun 2008 17:25:02 -0000	1.13
@@ -4,7 +4,7 @@
 
 Name: ice
 Version: 3.3.0
-Release: 1
+Release: 2
 Summary: The Ice base runtime and services
 
 Group: System Environment/Libraries
@@ -21,6 +21,8 @@
 Patch1:         Ice-3.3.0-java-build.patch
 Patch2:         Ice-3.3.0-jgoodies.patch
 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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Ice doesn't officially support this architecture at all
@@ -160,6 +162,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 %setup -q -n Ice-rpmbuild-%{version} -T -b 1
 %setup -q -n Ice-%{version}-man-pages -T -b 2
 
@@ -519,6 +522,9 @@
 %config(noreplace) %{_sysconfdir}/php.d/ice.ini
 
 %changelog
+* Wed Jun 28 2008 Mary Ellen Foster <mefoster at gmail.com> 3.3.0-2
+- Add patch from ZeroC
+
 * Mon Jun  9 2008 Mary Ellen Foster <mefoster at gmail.com> 3.3.0-1
 - Update for 3.3 final
 - Fix ppc64 issues with directories in Mono .pc files (I hope)