packages: ice/ice.spec, ice/IceGridAdmin.desktop (NEW), ice/dont-build-demo...
glen
glen at pld-linux.org
Sun Apr 4 15:55:15 CEST 2010
Author: glen Date: Sun Apr 4 13:55:15 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- bindings, based on fc cvs, still lots of todo
---- Files affected:
packages/ice:
ice.spec (1.3 -> 1.4) , IceGridAdmin.desktop (NONE -> 1.1) (NEW), dont-build-demo-test.patch (NONE -> 1.1) (NEW), icegridgui (NONE -> 1.1) (NEW), java-build.patch (NONE -> 1.1) (NEW), jgoodies.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/ice/ice.spec
diff -u packages/ice/ice.spec:1.3 packages/ice/ice.spec:1.4
--- packages/ice/ice.spec:1.3 Sat Apr 3 19:49:29 2010
+++ packages/ice/ice.spec Sun Apr 4 15:55:09 2010
@@ -3,6 +3,15 @@
# - get stuff from fc spec
# - cc/cflags
# - language bindings
+#
+# Conditional build:
+%bcond_without java # Java bindings
+%bcond_without dotnet # .NET bindings
+%bcond_without python # Python bindings
+%bcond_without ruby # Ruby bindings
+%bcond_without php # PHP bindings
+%bcond_without gui # IceGrid GUI
+
Summary: The Ice base runtime and services
Name: ice
Version: 3.4.0
@@ -11,15 +20,33 @@
Group: Applications
Source0: http://www.zeroc.com/download/Ice/3.4/Ice-%{version}.tar.gz
# Source0-md5: 998b10627ade020cb00f5beb73efc0e0
+# Extracted from http://zeroc.com/download/Ice/3.4/ice-3.4.0-1.src.rpm
+Source1: Ice-rpmbuild-%{version}.tar.gz
+# Source1-md5: 869cc60645e7e2b4115584a5ab17d1e9
+Source2: %{name}gridgui
+Source3: IceGridAdmin.desktop
URL: http://www.zeroc.com/
Patch0: %{name}-build.patch
+Patch1: dont-build-demo-test.patch
+Patch2: java-build.patch
+Patch3: jgoodies.patch
BuildRequires: db-cxx-devel
+%{?with_java:BuildRequires: db-java-devel}
+%{?with_java:BuildRequires: java-jgoodies-forms}
+%{?with_java:BuildRequires: java-jgoodies-looks}
BuildRequires: mcpp-devel
+%{?with_php:BuildRequires: php-devel >= 3:5.0.0}
+BuildRequires: rpmbuild(macros) >= 1.519
# drop these O/P if not needed
Provides: Ice
Obsoletes: Ice
+# Ice doesn't officially support ppc64 at all; sparc64 doesnt have mono
+ExcludeArch: ppc64 sparc64
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+# Some file suffixes we need to grab the right stuff for the file lists
+%define soversion 34
+
%description
Ice is a modern alternative to object middleware such as CORBA or
COM/DCOM/COM+. It is easy to learn, yet provides a powerful network
@@ -30,6 +57,18 @@
transport plug-ins, TCP/IP and UDP/IP support, SSL-based security, a
firewall solution, and much more.
+%package servers
+Summary: Ice services to run through /etc/rc.d/init.d
+Group: Development/Tools
+Requires(post): /sbin/chkconfig
+Requires(pre): shadow-utils
+Requires(preun): /sbin/chkconfig
+Requires(preun): /sbin/service
+Requires: %{name} = %{version}-%{release}
+
+%description servers
+Ice services to run through /etc/rc.d/init.d
+
%package devel
Summary: Tools for developing Ice applications in C++
Group: Development/Libraries
@@ -41,25 +80,296 @@
%description devel
Tools for developing Ice applications in C++.
+%package java
+Summary: The Ice runtime for Java
+Group: Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: db4-java
+Requires: java >= 1.5.0
+
+%description java
+The Ice runtime for Java
+
+%package java-devel
+Summary: Tools for developing Ice applications in Java
+Group: Development/Tools
+Requires: ice-java = %{version}-%{release}
+
+%description java-devel
+Tools for developing Ice applications in Java.
+
+%package csharp
+Summary: IceGrid Admin Tool
+Summary: The Ice runtime for C#
+Group: Development/Tools
+Group: Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
+Requires: ice-java = %{version}-%{release}
+Requires: java
+Requires: jgoodies-forms
+Requires: jgoodies-looks
+Requires: jpackage-utils
+Requires: mono-core >= 1.2.2
+Provides: ice-dotnet = %{version}-%{release}
+Obsoletes: ice-dotnet < %{version}-%{release}
+
+%description csharp
+The Ice runtime for C#
+
+%package csharp-devel
+Summary: Tools for developing Ice applications in C#
+Group: Development/Tools
+Requires: ice-csharp = %{version}-%{release}
+Requires: pkgconfig
+
+%description csharp-devel
+Tools for developing Ice applications in C#.
+
+%package ruby
+Summary: The Ice runtime for Ruby applications
+Group: Development/Tools
+Requires: %{name} = %{version}-%{release}
+Requires: ruby(abi) = 1.8
+
+%description ruby
+The Ice runtime for Ruby applications.
+
+%package ruby-devel
+Summary: Tools for developing Ice applications in Ruby
+Group: Development/Tools
+Requires: ice-ruby = %{version}-%{release}
+
+%description ruby-devel
+Tools for developing Ice applications in Ruby.
+
+%package python
+Summary: The Ice runtime for Python applications
+Group: Development/Tools
+Requires: %{name} = %{version}-%{release}
+Requires: python >= 2.3.4
+
+%description python
+The Ice runtime for Python applications.
+
+%package python-devel
+Summary: Tools for developing Ice applications in Python
+Group: Development/Tools
+Requires: ice-python = %{version}-%{release}
+
+%description python-devel
+Tools for developing Ice applications in Python.
+
+%package php
+Summary: The Ice runtime for PHP applications
+Group: Libraries
+Requires: %{name} = %{version}-%{release}
+%{?requires_php_extension}
+
+%description php
+The Ice runtime for PHP applications.
+
+%package php-devel
+Summary: Tools for developing Ice applications in PHP
+Group: Development/Tools
+Requires: ice-php = %{version}-%{release}
+
+%description php-devel
+Tools for developing Ice applications in PHP.
+
%prep
-%setup -q -n Ice-%{version}
+%setup -q -n Ice-%{version} -a 1
%patch0 -p0
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
%build
-%{__make}
+
+# Compile the main Ice runtime
+# TODO: CC/CXX passing as make param breaks build system
+%{__make} -C cpp \
+ CFLAGS="%{rpmcflags} -fPIC" \
+ CXXFLAGS="%{rpmcxxflags} -fPIC" \
+ embedded_runpath_prefix=""
+
+%if %{with java}
+# Set the CLASSPATH correctly for the Java compile
+export CLASSPATH=$(build-classpath db jgoodies-forms jgoodies-looks)
+
+# Rebuild the Java ImportKey class
+cd cpp/src/ca
+rm *.class
+javac ImportKey.java
+cd -
+
+%{__make} -C java \
+ CFLAGS="%{rpmcflags} -fPIC" \
+ CXXFLAGS="%{rpmcxxflags} -fPIC" \
+ embedded_runpath_prefix=""
+
+# Create the IceGrid icon
+cd java/resources/icons
+convert icegrid.ico temp.png
+mv temp-8.png icegrid.png
+rm temp*.png
+cd -
+%endif
+
+%if %{with dotnet}
+%{__make} -C cs \
+ CFLAGS="%{rpmcflags} -fPIC" \
+ CXXFLAGS="%{rpmcxxflags} -fPIC" \
+ embedded_runpath_prefix=""
+%endif
+
+%if %{with python}
+%{__make} -C py \
+ CFLAGS="%{rpmcflags} -fPIC" \
+ CXXFLAGS="%{rpmcxxflags} -fPIC" \
+ embedded_runpath_prefix=""
+%endif
+
+%if %{with ruby}
+%{__make} -C rb \
+ CFLAGS="%{rpmcflags} -fPIC" \
+ CXXFLAGS="%{rpmcxxflags} -fPIC" \
+ embedded_runpath_prefix=""
+%endif
+
+%if %{with php}
+%{__make} -C php \
+ PHP_HOME=%{_prefix} \
+ CFLAGS="%{rpmcflags} -fPIC" \
+ CXXFLAGS="%{rpmcxxflags} -fPIC" \
+ embedded_runpath_prefix=""
+%endif
%install
rm -rf $RPM_BUILD_ROOT
-
-install -d $RPM_BUILD_ROOT{%{_prefix},%{_datadir},%{_datadir}/Ice}
+install -d $RPM_BUILD_ROOT{%{_docdir}/Ice-%{version},%{_datadir}/Ice}
%{__make} install \
- prefix=$RPM_BUILD_ROOT
+ prefix=$RPM_BUILD_ROOT \
+ GACINSTALL=yes \
+ GAC_ROOT=$RPM_BUILD_ROOT%{_libdir} \
+ embedded_runpath_prefix=""
+
+%if %{with java}
+%{__make} -C java install \
+ prefix=$RPM_BUILD_ROOT \
+ GACINSTALL=yes \
+ GAC_ROOT=$RPM_BUILD_ROOT%{_libdir} \
+ embedded_runpath_prefix=""
+# Move Java stuff where it should be
+install -d $RPM_BUILD_ROOT%{_javadir}
+mv $RPM_BUILD_ROOT/lib/ant-ice.jar $RPM_BUILD_ROOT%{_javadir}/ant-ice-%{version}.jar
+ln -s ant-ice-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/ant-ice.jar
+mv $RPM_BUILD_ROOT/lib/Ice.jar $RPM_BUILD_ROOT%{_javadir}/Ice-%{version}.jar
+ln -s Ice-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/Ice.jar
+mv $RPM_BUILD_ROOT/lib/Freeze.jar $RPM_BUILD_ROOT%{_javadir}/Freeze-%{version}.jar
+ln -s Freeze-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/Freeze.jar
+%endif
+
+%if %{with gui}
+# Install the IceGrid GUI
+mv $RPM_BUILD_ROOT/lib/IceGridGUI.jar $RPM_BUILD_ROOT%{_datadir}/Ice
+install -d $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
+cp -a java/resources/icons/icegrid.png \
+ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
+install -d $RPM_BUILD_ROOT%{_bindir}
+install -p %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}
+install -d $RPM_BUILD_ROOT%{_desktopdir}
+cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_desktopdir}
+%endif
+
+# Move other rpm-specific files into the right place (README, service stuff)
+cp -a Ice-rpmbuild-%{version}/ice.ini $RPM_BUILD_ROOT/ice.ini
+
+# Install the servers
+install -d $RPM_BUILD_ROOT%{_sysconfdir}
+cp -a Ice-rpmbuild-%{version}/*.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
+done
+install -d $RPM_BUILD_ROOT%{_localstatedir}/lib/icegrid
+
+# "make install" assumes it's going into a directory under /opt.
+# Move things to where they should be in an RPM setting (adapted from
+# the original ZeroC srpm).
+install -d $RPM_BUILD_ROOT%{_bindir}
+mv $RPM_BUILD_ROOT/bin/* $RPM_BUILD_ROOT%{_bindir}
+install -d $RPM_BUILD_ROOT%{_includedir}
+mv $RPM_BUILD_ROOT/include/* $RPM_BUILD_ROOT%{_includedir}
+install -d $RPM_BUILD_ROOT%{_libdir}
+# There are a couple of files that end up installed in /lib, not %{_libdir},
+# so we try this move too.
+mv $RPM_BUILD_ROOT/%{_lib}/* $RPM_BUILD_ROOT%{_libdir}
+mv $RPM_BUILD_ROOT/lib/* $RPM_BUILD_ROOT%{_libdir} || true
+mv $RPM_BUILD_ROOT/help/IceGridAdmin $RPM_BUILD_ROOT%{_docdir}/Ice-%{version}
+
+# Copy the man pages into the correct directory
+install -d $RPM_BUILD_ROOT%{_mandir}/man1
+#cp -a $RPM_BUILD_DIR/Ice-3.3.0-man-pages/*.1 $RPM_BUILD_ROOT%{_mandir}/man1
+
+# Fix the encoding and line-endings of all the IceGridAdmin documentation files
+cd $RPM_BUILD_ROOT%{_docdir}/Ice-%{version}/IceGridAdmin
+chmod a-x *
+for f in *.js *.css; do
+ dos2unix $f
+done
+for f in helpman_topicinit.js icegridadmin_navigation.js IceGridAdmin_popup_html.js zoom_pageinfo.js; do
+ iconv -f ISO88591 -t UTF8 $f -o $f.tmp
+ mv $f.tmp $f
+done
+cd -
+
+%if %{with dotnet}
+# .NET spec files (for csharp-devel) -- convert the paths
+for f in IceGrid Glacier2 IceBox Ice IceStorm IcePatch2; do
+ sed -i -e "s#/lib/#%{_libdir}/#" $RPM_BUILD_ROOT%{_libdir}/pkgconfig/$f.pc
+ sed -i -e "s#mono_root}/usr#mono_root}#" $RPM_BUILD_ROOT%{_libdir}/pkgconfig/$f.pc
+ mv $RPM_BUILD_ROOT%{_bindir}/$f.xml $RPM_BUILD_ROOT%{_libdir}/mono/gac/$f/%{version}.*/
+done
+%endif
+
+%if %{with python}
+%{__sed} -i -e '1s,/usr/bin/env python,%{__python},' $RPM_BUILD_ROOT/python/Ice.py
+install -d $RPM_BUILD_ROOT%{py_sitedir}/Ice
+mv $RPM_BUILD_ROOT/python/* $RPM_BUILD_ROOT%{py_sitedir}/Ice
+cp -a Ice-rpmbuild-%{version}/ice.pth $RPM_BUILD_ROOT%{py_sitedir}
+%endif
+
+%if %{with ruby}
+%{__sed} -i -e '1s,/usr/bin/env ruby,%{__ruby},' $RPM_BUILD_ROOT/ruby/*.rb
+install -d $RPM_BUILD_ROOT%{ruby_sitearchdir}
+mv $RPM_BUILD_ROOT/ruby/* $RPM_BUILD_ROOT%{ruby_sitearchdir}
+%endif
+
+%if %{with php}
+# Put the PHP stuff into the right place
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/php.d
+mv $RPM_BUILD_ROOT/ice.ini $RPM_BUILD_ROOT%{_sysconfdir}/php.d
+install -d $RPM_BUILD_ROOT%{php_extdir}
+mv $RPM_BUILD_ROOT/php/IcePHP.so $RPM_BUILD_ROOT%{php_extdir}
+install -d $RPM_BUILD_ROOT%{_datadir}/php
+mv $RPM_BUILD_ROOT/php/* $RPM_BUILD_ROOT%{_datadir}/php
+%endif
-mv $RPM_BUILD_ROOT/bin $RPM_BUILD_ROOT%{_prefix}
-mv $RPM_BUILD_ROOT/include $RPM_BUILD_ROOT%{_prefix}
-mv $RPM_BUILD_ROOT/lib64 $RPM_BUILD_ROOT%{_prefix}
+mv $RPM_BUILD_ROOT/config/* $RPM_BUILD_ROOT%{_datadir}/Ice
mv $RPM_BUILD_ROOT/slice $RPM_BUILD_ROOT%{_datadir}/Ice
+# Somehow, some files under "slice" end up with executable permissions -- ??
+find $RPM_BUILD_ROOT%{_datadir}/Ice -name "*.ice" | xargs chmod a-x
+
+# Move the ImportKey.class file -- it'll be in %{_libdir} because of the moves earlier
+mv $RPM_BUILD_ROOT%{_libdir}/ImportKey.class $RPM_BUILD_ROOT%{_datadir}/Ice
+
+# Move the license files into the documentation directory
+mv $RPM_BUILD_ROOT/ICE_LICENSE $RPM_BUILD_ROOT%{_docdir}/Ice-%{version}/ICE_LICENSE
+mv $RPM_BUILD_ROOT/LICENSE $RPM_BUILD_ROOT%{_docdir}/Ice-%{version}/LICENSE
+# Copy in the other files too
+cp CHANGES RELEASE_NOTES $RPM_BUILD_ROOT%{_docdir}/Ice-%{version}/
%clean
rm -rf $RPM_BUILD_ROOT
@@ -69,7 +379,6 @@
%files
%defattr(644,root,root,755)
-%doc ICE_LICENSE
%attr(755,root,root) %{_bindir}/dumpdb
%attr(755,root,root) %{_bindir}/glacier2router
%attr(755,root,root) %{_bindir}/icebox
@@ -160,6 +469,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.4 2010/04/04 13:55:09 glen
+- bindings, based on fc cvs, still lots of todo
+
Revision 1.3 2010/04/03 17:49:29 glen
- rename to ice (as upstream rpm)
- add todo, will commit more stuff when i manage to build
================================================================
Index: packages/ice/IceGridAdmin.desktop
diff -u /dev/null packages/ice/IceGridAdmin.desktop:1.1
--- /dev/null Sun Apr 4 15:55:15 2010
+++ packages/ice/IceGridAdmin.desktop Sun Apr 4 15:55:09 2010
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=IceGrid Admin
+GenericName=IceGrid Admin
+Comment=Graphical administration tool for IceGrid
+Exec=icegridgui
+Icon=icegrid
+Terminal=false
+Type=Application
+Categories=Development;
================================================================
Index: packages/ice/dont-build-demo-test.patch
diff -u /dev/null packages/ice/dont-build-demo-test.patch:1.1
--- /dev/null Sun Apr 4 15:55:15 2010
+++ packages/ice/dont-build-demo-test.patch Sun Apr 4 15:55:09 2010
@@ -0,0 +1,25 @@
+Don't build the demo or test directories
+diff -ur Ice-3.3.0.orig/cpp/Makefile Ice-3.3.0/cpp/Makefile
+--- Ice-3.3.0.orig/cpp/Makefile 2008-05-16 18:24:00.000000000 +0100
++++ Ice-3.3.0/cpp/Makefile 2008-05-21 11:18:17.000000000 +0100
+@@ -11,7 +11,7 @@
+
+ include $(top_srcdir)/config/Make.rules
+
+-SUBDIRS = config src include test demo
++SUBDIRS = config src include
+
+ INSTALL_SUBDIRS = $(install_bindir) $(install_libdir) $(install_includedir) $(install_configdir)
+
+diff -ur Ice-3.3.0.orig/cs/Makefile Ice-3.3.0/cs/Makefile
+--- Ice-3.3.0.orig/cs/Makefile 2008-05-16 18:24:01.000000000 +0100
++++ Ice-3.3.0/cs/Makefile 2008-05-21 11:18:22.000000000 +0100
+@@ -11,7 +11,7 @@
+
+ include $(top_srcdir)/config/Make.rules.cs
+
+-SUBDIRS = src test demo
++SUBDIRS = src
+
+ install:: install-common
+ @if test ! -d $(install_bindir) ; \
================================================================
Index: packages/ice/icegridgui
diff -u /dev/null packages/ice/icegridgui:1.1
--- /dev/null Sun Apr 4 15:55:15 2010
+++ packages/ice/icegridgui Sun Apr 4 15:55:09 2010
@@ -0,0 +1,4 @@
+#!/bin/sh
+exec java \
+ -cp $(build-classpath Ice jgoodies-looks jgoodies-forms):/usr/share/Ice/IceGridGUI.jar \
+ IceGridGUI.Main "$@"
================================================================
Index: packages/ice/java-build.patch
diff -u /dev/null packages/ice/java-build.patch:1.1
--- /dev/null Sun Apr 4 15:55:15 2010
+++ packages/ice/java-build.patch Sun Apr 4 15:55:09 2010
@@ -0,0 +1,54 @@
+Don't put manifest in jar; don't build demo or test; use system jgoodies
+
+diff -ur Ice-3.4.0.orig/java/build.xml Ice-3.4.0/java/build.xml
+--- Ice-3.4.0.orig/java/build.xml 2010-03-12 12:51:00.743391980 +0000
++++ Ice-3.4.0/java/build.xml 2010-03-12 12:54:01.002548076 +0000
+@@ -230,7 +230,6 @@
+ <include name="Freeze/**"/>
+ <manifest>
+ <attribute name="Built-By" value="ZeroC, Inc."/>
+- <attribute name="Class-Path" value="db.jar db-${db.version}.jar /usr/share/java/db-${db.version}.jar ../db.jar"/>
+ </manifest>
+ </jar>
+ <jar jarfile="${lib.dir}/Freeze.jar" basedir="${src.dir}" update="yes">
+@@ -508,17 +507,12 @@
+ </condition>
+
+ <target name="icegridadmin-plain-jar" depends="icegridadmin-compile" if="build-icegridadmin-plain-jar" unless="ice.bin.dist">
+- <manifest file="${lib.dir}/icegridgui.mf">
+- <attribute name="Main-Class" value="IceGridGUI.Main"/>
+- <attribute name="Class-Path" value="Ice.jar ${jgoodies.forms} ${jgoodies.looks} ../resources/ "/>
+- </manifest>
+- <jar jarfile="${lib.dir}/IceGridGUI.jar" manifest="${lib.dir}/icegridgui.mf" basedir="${lib.dir}">
++ <jar jarfile="${lib.dir}/IceGridGUI.jar" basedir="${lib.dir}">
+ <include name="IceGridGUI/**"/>
+ </jar>
+ <jar jarfile="${lib.dir}/IceGridGUI.jar" basedir="resources" update="true">
+ <include name="icons/**"/>
+ </jar>
+- <delete file="${lib.dir}/icegridgui.mf" />
+ </target>
+
+ <target name="icegridadmin-pro-jar" depends="ice-jar,icegridadmin-compile" if="build-icegridadmin-pro-jar" unless="ice.bin.dist">
+@@ -607,8 +601,6 @@
+ <target name="test" depends="test-compile, ice-compile"/>
+
+ <target name="all" depends="jar">
+- <ant inheritAll="false" dir="test"/>
+- <ant inheritAll="false" dir="demo"/>
+ </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
+@@ -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
================================================================
Index: packages/ice/jgoodies.patch
diff -u /dev/null packages/ice/jgoodies.patch:1.1
--- /dev/null Sun Apr 4 15:55:15 2010
+++ packages/ice/jgoodies.patch Sun Apr 4 15:55:09 2010
@@ -0,0 +1,13 @@
+Remove reference to Windows L&F
+--- Ice-3.3.1/java/src/IceGridGUI/ApplicationPane.java.orig 2009-03-25 11:30:28.000000000 +0100
++++ Ice-3.3.1/java/src/IceGridGUI/ApplicationPane.java 2009-03-25 11:30:51.000000000 +0100
+@@ -26,9 +26,6 @@
+ import javax.swing.tree.TreePath;
+ import javax.swing.tree.TreeSelectionModel;
+
+-import com.jgoodies.looks.Options;
+-import com.jgoodies.looks.plastic.PlasticLookAndFeel;
+-import com.jgoodies.looks.windows.WindowsLookAndFeel;
+ import com.jgoodies.forms.factories.Borders;
+
+ import IceGrid.*;
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ice/ice.spec?r1=1.3&r2=1.4&f=u
More information about the pld-cvs-commit
mailing list