packages: ice/ice.spec, ice/java-build.patch - up to 3.4.1, more csharp fil...

Thu Jun 10 15:05:36 CEST 2010

Author: glen                         Date: Thu Jun 10 13:05:36 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 3.4.1, more csharp files packaged

---- Files affected:
packages/ice:
   ice.spec (1.30 -> 1.31) , java-build.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/ice/ice.spec
diff -u packages/ice/ice.spec:1.30 packages/ice/ice.spec:1.31

--- packages/ice/ice.spec:1.30	Mon May 31 09:07:18 2010
+++ packages/ice/ice.spec	Thu Jun 10 15:05:31 2010
@@ -17,15 +17,15 @@
 %{?with_java:%include	/usr/lib/rpm/macros.java}
 Summary:	The Ice base runtime and services
 Name:		ice
-Version:	3.4.0
-Release:	5
+Version:	3.4.1
+Release:	1
 License:	GPL v2 with exceptions (see ICE_LICENSE)
 Group:		Applications
 URL:		http://www.zeroc.com/
 Source0:	http://www.zeroc.com/download/Ice/3.4/Ice-%{version}.tar.gz
-# Source0-md5:	998b10627ade020cb00f5beb73efc0e0
+# Source0-md5:	3aae42aa47dec74bb258c1a1b2847a1a
 # Extracted from http://zeroc.com/download/Ice/3.4/ice-3.4.0-1.src.rpm
-Source1:	Ice-rpmbuild-%{version}.tar.gz
+Source1:	Ice-rpmbuild-3.4.0.tar.gz
 # Source1-md5:	869cc60645e7e2b4115584a5ab17d1e9
 # Man pages courtesy of Francisco Moya's Debian packages
 Source2:	Ice-3.3.0-man-pages.tbz2
@@ -190,7 +190,7 @@
 %endif
 
 # update path to our install
-sed -i -e 's,/usr/share/Ice-%{version},%{_datadir}/Ice,' cpp/src/ca/iceca Ice-rpmbuild-%{version}/icegridregistry.conf
+sed -i -e 's,/usr/share/Ice-%{version},%{_datadir}/Ice,' cpp/src/ca/iceca Ice-rpmbuild-*/icegridregistry.conf
 
 # force our CC/CXX as build system compares for exactly "c++" to setup other rules
 sed -i -e 's,c++,%{__cxx},g' cpp/config/Make.rules.Linux
@@ -341,7 +341,7 @@
 mv $RPM_BUILD_ROOT/python/IcePy.so.*.*.* $RPM_BUILD_ROOT%{py_sitedir}/Ice/IcePy.so
 rm -f $RPM_BUILD_ROOT/python/IcePy.so*
 mv $RPM_BUILD_ROOT/python/* $RPM_BUILD_ROOT%{py_sitedir}/Ice
-cp -a Ice-rpmbuild-%{version}/ice.pth $RPM_BUILD_ROOT%{py_sitedir}
+cp -a Ice-rpmbuild-*/ice.pth $RPM_BUILD_ROOT%{py_sitedir}
 %py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
 %py_comp $RPM_BUILD_ROOT%{py_sitedir}
 %py_postclean
@@ -362,7 +362,7 @@
 	prefix=$RPM_BUILD_ROOT
 # Put the PHP stuff into the right place
 install -d $RPM_BUILD_ROOT{%{php_sysconfdir}/conf.d,%{php_extensiondir},%{php_data_dir}}
-cp -a Ice-rpmbuild-%{version}/ice.ini $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d
+cp -a Ice-rpmbuild-*/ice.ini $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d
 mv $RPM_BUILD_ROOT/php/IcePHP.so $RPM_BUILD_ROOT%{php_extensiondir}
 mv $RPM_BUILD_ROOT/php/* $RPM_BUILD_ROOT%{php_data_dir}
 %endif
@@ -378,10 +378,10 @@
 
 # Install the servers
 install -d $RPM_BUILD_ROOT%{_sysconfdir}
-cp -a Ice-rpmbuild-%{version}/*.conf $RPM_BUILD_ROOT%{_sysconfdir}
+cp -a Ice-rpmbuild-*/*.conf $RPM_BUILD_ROOT%{_sysconfdir}
 install -d $RPM_BUILD_ROOT%{_initrddir}
 for i in icegridregistry icegridnode glacier2router; do
-	cp -a Ice-rpmbuild-%{version}/$i.redhat $RPM_BUILD_ROOT%{_initrddir}/$i
+	cp -a Ice-rpmbuild-*/$i.redhat $RPM_BUILD_ROOT%{_initrddir}/$i
 done
 install -d $RPM_BUILD_ROOT%{_localstatedir}/lib/icegrid
 
@@ -562,12 +562,20 @@
 %{_prefix}/lib/mono/IceGrid
 %{_prefix}/lib/mono/IcePatch2
 %{_prefix}/lib/mono/IceStorm
+
 %{_prefix}/lib/mono/gac/Glacier2
 %{_prefix}/lib/mono/gac/Ice
 %{_prefix}/lib/mono/gac/IceBox
 %{_prefix}/lib/mono/gac/IceGrid
 %{_prefix}/lib/mono/gac/IcePatch2
 %{_prefix}/lib/mono/gac/IceStorm
+
+%{_prefix}/lib/mono/gac/policy.3.4.Glacier2
+%{_prefix}/lib/mono/gac/policy.3.4.Ice
+%{_prefix}/lib/mono/gac/policy.3.4.IceBox
+%{_prefix}/lib/mono/gac/policy.3.4.IceGrid
+%{_prefix}/lib/mono/gac/policy.3.4.IcePatch2
+%{_prefix}/lib/mono/gac/policy.3.4.IceStorm
 %endif
 
 %if %{with python}
@@ -640,6 +648,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.31  2010/06/10 13:05:31  glen
+- up to 3.4.1, more csharp files packaged
+
 Revision 1.30  2010/05/31 07:07:18  hawk
 - GAC_ROOT can't be %{_libdir}, mono resides in /usr/lib on x86_64
 

================================================================
Index: packages/ice/java-build.patch
diff -u packages/ice/java-build.patch:1.1 packages/ice/java-build.patch:1.2
--- packages/ice/java-build.patch:1.1	Sun Apr  4 15:55:09 2010
+++ packages/ice/java-build.patch	Thu Jun 10 15:05:31 2010
@@ -39,16 +39,15 @@
      </target>
  
      <target name="install-common">
-diff -ur Ice-3.4.0.orig/java/config/build.properties Ice-3.4.0/java/config/build.properties
---- Ice-3.4.0.orig/java/config/build.properties	2010-03-12 12:51:00.773391918 +0000
-+++ Ice-3.4.0/java/config/build.properties	2010-03-12 12:54:29.169346467 +0000
+--- Ice-3.4.1/java/config/build.properties~	2010-06-03 19:48:34.000000000 +0300
++++ Ice-3.4.1/java/config/build.properties	2010-06-10 11:01:36.101008204 +0300
 @@ -31,7 +31,7 @@
  # These properties only need to be set if you want to build the
  # standalone jar for the IceGrid GUI.
  #
--jgoodies.forms  = /usr/share/java/forms-1.2.1.jar
--jgoodies.looks  = /usr/share/java/looks-2.3.0.jar
-+jgoodies.forms  = /usr/share/java/jgoodies-forms.jar
-+jgoodies.looks  = /usr/share/java/jgoodies-looks.jar
- #jgoodies.forms = C:/Program\ Files/ZeroC/Ice-${ice.version}-ThirdParty/lib/forms-1.2.1.jar
- #jgoodies.looks = C:/Program\ Files/ZeroC/Ice-${ice.version}-ThirdParty/lib/looks-2.3.0.jar
+-jgoodies.forms  = /usr/share/java/forms-1.3.0.jar
+-jgoodies.looks  = /usr/share/java/looks-2.3.1.jar
+++jgoodies.forms = /usr/share/java/jgoodies-forms.jar
+++jgoodies.looks = /usr/share/java/jgoodies-looks.jar
+ #jgoodies.forms = C:/Program\ Files/ZeroC/Ice-${ice.version}-ThirdParty/lib/forms-1.3.0.jar
+ #jgoodies.looks = C:/Program\ Files/ZeroC/Ice-${ice.version}-ThirdParty/lib/looks-2.3.1.jar
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ice/ice.spec?r1=1.30&r2=1.31&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ice/java-build.patch?r1=1.1&r2=1.2&f=u

