rpms/ice/F-9 ice.spec,1.12,1.13

Mon Jun 9 15:44:16 UTC 2008

Author: mef

Update of /cvs/pkgs/rpms/ice/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14527

Modified Files:
	ice.spec 
Log Message:
Add new spec too


Index: ice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ice/F-9/ice.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13

--- ice.spec	9 Jun 2008 15:39:16 -0000	1.12
+++ ice.spec	9 Jun 2008 15:41:45 -0000	1.13
@@ -1,36 +1,33 @@
-# Some defines for the Java subpackages
-%define java5 1
-%define icegridgui 1
-
-# Get Python and Ruby packages into sitelib (see Fedora Wiki)
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+# Get Python and Ruby packages into sitearch (see Fedora Wiki)
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-%{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')}
 %{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')}
 
 Name: ice
-Version: 3.3b
-Release: 1%{?dist}
+Version: 3.3.0
+Release: 1
 Summary: The Ice base runtime and services
 
 Group: System Environment/Libraries
 License: GPLv2 with exceptions
 URL: http://www.zeroc.com/
 Source0:        http://www.zeroc.com/download/Ice/3.3/Ice-%{version}.tar.gz
-Source1:        http://www.zeroc.com/download/Ice/3.2/Ice-rpmbuild-%{version}.tar.gz
+Source1:        Ice-rpmbuild-%{version}.tar.gz
+# Man pages courtesy of Francisco Moya's Debian packages
+Source2:        Ice-%{version}-man-pages.tbz
 Source8:        icegridgui
 Source9:        IceGridAdmin.desktop
-Source9:        IceGridAdmin.desktop
-Source10:       Ice-3.3-README.Fedora
-Patch0:         ice-file-compare.patch.txt
-Patch1:         Ice-3.3b-java-compile.patch
+Source10:       Ice-%{version}-README.Fedora
+Patch0:         Ice-3.3-dont-build-demo-test.patch
+Patch1:         Ice-3.3.0-java-build.patch
+Patch2:         Ice-3.3.0-jgoodies.patch
+Patch3:         Ice-3.3.0-java-Timer.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Ice doesn't officially support this architecture at all
 ExcludeArch:    ppc64
 
 # Some file suffixes we need to grab the right stuff for the file lists
-%define soversion 33b
+%define soversion 33
 
 BuildRequires: db4-devel, expat-devel, openssl-devel, bzip2-devel
 BuildRequires: ant, ant-nodeps, jpackage-utils, db4-java
@@ -39,6 +36,7 @@
 BuildRequires: python-devel
 BuildRequires: mono-core, mono-devel
 BuildRequires: libmcpp-devel >= 2.7.1
+BuildRequires: dos2unix
 
 BuildRequires:  java-devel >= 1.5.0
 
@@ -83,11 +81,7 @@
 %package java
 Summary: The Ice runtime for Java
 Group: System Environment/Libraries
-%if %{java5}
 Requires:       java >= 1.5.0
-%else
-Requires:       java >= 1.4.2
-%endif
 Requires: ice = %{version}-%{release}, db4-java
 %description java
 The Ice runtime for Java
@@ -99,7 +93,6 @@
 %description java-devel
 Tools for developing Ice applications in Java.
 
-%if %{icegridgui}
 %package -n icegrid-gui
 Summary: IceGrid Admin Tool
 Group: Development/Tools
@@ -109,7 +102,6 @@
 Requires: jpackage-utils
 %description -n icegrid-gui
 Graphical administration tool for IceGrid
-%endif
 
 %package csharp
 Summary: The Ice runtime for C#
@@ -165,44 +157,32 @@
 %prep
 %setup -n Ice-%{version} -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 %setup -q -n Ice-rpmbuild-%{version} -T -b 1
-cd ${RPM_BUILD_DIR}/Ice-%{version}/java
-%patch1 -p2
+%setup -q -n Ice-%{version}-man-pages -T -b 2
 
 %build
+# Set the CLASSPATH correctly for the Java compile
+export CLASSPATH=`build-classpath db jgoodies-forms jgoodies-looks ant`
+
 # Compile the main Ice runtime
-cd ${RPM_BUILD_DIR}/Ice-%{version}/cpp/src
+cd ${RPM_BUILD_DIR}/Ice-%{version}
 make CXXFLAGS="%{optflags} -fPIC" CFLAGS="%{optflags} -fPIC" embedded_runpath_prefix=""
 
-# Set the CLASSPATH correctly for subsequent compiles
-export CLASSPATH=`build-classpath db jgoodies-forms jgoodies-looks ant`
-
-# Rebuild the Java class
-cd ca
+# Rebuild the Java ImportKey class
+cd ${RPM_BUILD_DIR}/Ice-%{version}/cpp/src/ca
 rm *.class
-# javac -source 1.4 -target 1.4 ImportKey.java
 javac ImportKey.java
 
-# Stuff for java-devel
-cd $RPM_BUILD_DIR/Ice-%{version}/java
-ant clean
-ant jar
-
 # Create the IceGrid icon
+cd $RPM_BUILD_DIR/Ice-%{version}/java
 cd resources/icons
 convert icegrid.ico temp.png
 mv temp-8.png icegrid.png
 rm temp*.png
 
-cd $RPM_BUILD_DIR/Ice-%{version}/cs/src
-make OPTIMIZE=yes
-
-cd $RPM_BUILD_DIR/Ice-%{version}/php/src
-make CXXFLAGS="%{optflags} -fPIC" embedded_runpath_prefix=""
-cd $RPM_BUILD_DIR/Ice-%{version}/py
-make CXXFLAGS="%{optflags} -fPIC" embedded_runpath_prefix=""
-cd $RPM_BUILD_DIR/Ice-%{version}/rb
-make CXXFLAGS="%{optflags} -fPIC" embedded_runpath_prefix=""
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -211,7 +191,7 @@
 cd $RPM_BUILD_DIR/Ice-%{version}
 make prefix=$RPM_BUILD_ROOT GACINSTALL=yes GAC_ROOT=$RPM_BUILD_ROOT%{_libdir} embedded_runpath_prefix="" install
 
-# Install Java stuff where it wants to be
+# Move Java stuff where it should be
 mkdir -p ${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
@@ -232,9 +212,6 @@
         --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
         %{SOURCE9}
 
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
-mv $RPM_BUILD_ROOT/bin/iceboxnet.exe $RPM_BUILD_ROOT%{_bindir}
-
 # Move other rpm-specific files into the right place (README, service stuff)
 mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir}/Ice-%{version}
 cp -p %{SOURCE10} $RPM_BUILD_ROOT/%{_defaultdocdir}/Ice-%{version}/README.Fedora
@@ -258,16 +235,36 @@
 mkdir -p $RPM_BUILD_ROOT%{_includedir}
 mv $RPM_BUILD_ROOT/include/* ${RPM_BUILD_ROOT}%{_includedir}
 mkdir -p $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
 mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir}/Ice-%{version}
-mv $RPM_BUILD_ROOT/help/* $RPM_BUILD_ROOT%{_defaultdocdir}/Ice-%{version}
+mv $RPM_BUILD_ROOT/help/IceGridAdmin $RPM_BUILD_ROOT%{_defaultdocdir}/Ice-%{version}
 
-# .NET spec files (for csharp-devel)
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
+# Copy the man pages into the correct directory
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
+cp -p $RPM_BUILD_DIR/Ice-%{version}-man-pages/*.1 $RPM_BUILD_ROOT%{_mandir}/man1
+
+# Fix the encoding and line-endings of all the IceGridAdmin documentation files
+cd $RPM_BUILD_ROOT%{_defaultdocdir}/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
 
+# .NET spec files (for csharp-devel) -- convert the paths
 for f in IceGrid Glacier2 IceBox Ice IceStorm IcePatch2;
 do 
-    cp -p $RPM_BUILD_DIR/Ice-%{version}/cs/lib/pkgconfig/$f.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig 
+    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
 done
 
 # Put the PHP stuff into the right place
@@ -285,23 +282,20 @@
 mkdir -p ${RPM_BUILD_ROOT}%{ruby_sitearch}
 mv $RPM_BUILD_ROOT/ruby/* ${RPM_BUILD_ROOT}%{ruby_sitearch}
 mkdir -p ${RPM_BUILD_ROOT}%{python_sitearch}/Ice
-cp -p $RPM_BUILD_DIR/Ice-rpmbuild-%{version}/ice.pth $RPM_BUILD_ROOT%{python_sitearch}
-mv ${RPM_BUILD_ROOT}/python/IcePy.so* ${RPM_BUILD_ROOT}%{python_sitearch}/Ice
-mkdir -p ${RPM_BUILD_ROOT}%{python_sitelib}/Ice
-cp -p $RPM_BUILD_DIR/Ice-rpmbuild-%{version}/ice.pth $RPM_BUILD_ROOT%{python_sitearch}
-mv ${RPM_BUILD_ROOT}/python/* ${RPM_BUILD_ROOT}%{python_sitelib}/Ice
+mv ${RPM_BUILD_ROOT}/python/* ${RPM_BUILD_ROOT}%{python_sitearch}/Ice
 
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/Ice-%{version}
 mv $RPM_BUILD_ROOT/config/* ${RPM_BUILD_ROOT}%{_datadir}/Ice-%{version}
 mv $RPM_BUILD_ROOT/slice ${RPM_BUILD_ROOT}%{_datadir}/Ice-%{version}
 # Somehow, some files under "slice" end up with executable permissions -- ??
 find ${RPM_BUILD_ROOT}%{_datadir}/Ice-%{version} -name "*.ice" | xargs chmod a-x
-# Move ImportKey.class into the share directory
+
+# Move the ImportKey.class file -- it'll be in %{_libdir} because of the moves earlier
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/Ice-%{version}
 mv $RPM_BUILD_ROOT%{_libdir}/ImportKey.class ${RPM_BUILD_ROOT}%{_datadir}/Ice-%{version}
 
+# Put the license files in as documentation
 mkdir -p ${RPM_BUILD_ROOT}%{_defaultdocdir}/Ice-%{version}
-# mv $RPM_BUILD_ROOT/doc/reference ${RPM_BUILD_ROOT}%{_defaultdocdir}/Ice-%{version}
-# rm -rf $RPM_BUILD_ROOT/doc
 mv $RPM_BUILD_ROOT/ICE_LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/Ice-%{version}/ICE_LICENSE
 mv $RPM_BUILD_ROOT/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/Ice-%{version}/LICENSE
 
@@ -313,11 +307,28 @@
 %files
 %defattr(-,root,root,-)
 %{_defaultdocdir}/Ice-%{version}
+%doc %{_mandir}/man1/dumpdb.1.gz
+%doc %{_mandir}/man1/glacier2router.1.gz
+%doc %{_mandir}/man1/icebox.1.gz
+%doc %{_mandir}/man1/iceboxadmin.1.gz
+%doc %{_mandir}/man1/icegridadmin.1.gz
+%doc %{_mandir}/man1/icegridnode.1.gz
+%doc %{_mandir}/man1/icegridregistry.1.gz
+%doc %{_mandir}/man1/icepatch2calc.1.gz
+%doc %{_mandir}/man1/icepatch2client.1.gz
+%doc %{_mandir}/man1/icepatch2server.1.gz
+%doc %{_mandir}/man1/icestormadmin.1.gz
+%doc %{_mandir}/man1/slice2docbook.1.gz
+%doc %{_mandir}/man1/slice2html.1.gz
+%doc %{_mandir}/man1/transformdb.1.gz
 %{_bindir}/dumpdb
-%{_bindir}/transformdb
 %{_bindir}/glacier2router
 %{_bindir}/icebox
 %{_bindir}/iceboxadmin
+%{_bindir}/iceca
+%{_bindir}/icegridadmin
+%{_bindir}/icegridnode
+%{_bindir}/icegridregistry
 %{_bindir}/icepatch2calc
 %{_bindir}/icepatch2client
 %{_bindir}/icepatch2server
@@ -325,10 +336,7 @@
 %{_bindir}/icestormmigrate
 %{_bindir}/slice2docbook
 %{_bindir}/slice2html
-%{_bindir}/icegridadmin
-%{_bindir}/icegridnode
-%{_bindir}/icegridregistry
-%{_bindir}/iceca
+%{_bindir}/transformdb
 %{_libdir}/libFreeze.so.%{version}
 %{_libdir}/libFreeze.so.%{soversion}
 %{_libdir}/libGlacier2.so.%{version}
@@ -353,13 +361,10 @@
 %{_libdir}/libSlice.so.%{soversion}
 %{_libdir}/libIceGrid.so.%{version}
 %{_libdir}/libIceGrid.so.%{soversion}
-%dir %{_datadir}/Ice-%{version}
-%{_datadir}/Ice-%{version}/slice
-%{_datadir}/Ice-%{version}/templates.xml
-%{_datadir}/Ice-%{version}/ImportKey.class
-%attr(755,root,root) %{_datadir}/Ice-%{version}/convertssl.py*
-%attr(755,root,root) %{_datadir}/Ice-%{version}/upgradeicegrid.py*
-%{_datadir}/Ice-%{version}/icegrid-slice.*.ice.gz
+%{_datadir}/Ice-%{version}
+# Exclude the stuff that's in IceGrid
+%exclude %{_defaultdocdir}/Ice-%{version}/IceGridAdmin
+%exclude %{_datadir}/Ice-%{version}/IceGridGUI.jar
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -406,6 +411,8 @@
 
 %files devel
 %defattr(-, root, root, -)
+%doc %{_mandir}/man1/slice2cpp.1.gz
+%doc %{_mandir}/man1/slice2freeze.1.gz
 %{_bindir}/slice2cpp
 %{_bindir}/slice2freeze
 %{_includedir}/Freeze
@@ -437,17 +444,19 @@
 %{_javadir}/Ice-%{version}.jar
 %{_javadir}/Ice.jar
 
-%if %{icegridgui}
 %files -n icegrid-gui
 %defattr(-,root,root,-)
 %{_datadir}/Ice-%{version}/IceGridGUI.jar
 %attr(755,root,root) %{_bindir}/icegridgui
+%doc %{_mandir}/man1/icegridgui.1.gz
 %{_datadir}/applications/IceGridAdmin.desktop
 %{_datadir}/icons/hicolor/48x48/apps/icegrid.png
-%endif
+%{_defaultdocdir}/Ice-%{version}/IceGridAdmin
 
 %files java-devel
 %defattr(-,root,root,-)
+%doc %{_mandir}/man1/slice2java.1.gz
+%doc %{_mandir}/man1/slice2freezej.1.gz
 %{_bindir}/slice2java
 %{_bindir}/slice2freezej
 %{_javadir}/ant-ice-%{version}.jar
@@ -455,33 +464,28 @@
 
 %files csharp
 %defattr(-,root,root,-)
-%dir %{_libdir}/mono/Glacier2/
-%{_libdir}/mono/Glacier2/Glacier2.dll
-%dir %{_libdir}/mono/Ice/
-%{_libdir}/mono/Ice/Ice.dll
-%dir %{_libdir}/mono/IceBox/
-%{_libdir}/mono/IceBox/IceBox.dll
-%dir %{_libdir}/mono/IceGrid/
-%{_libdir}/mono/IceGrid/IceGrid.dll
-%dir %{_libdir}/mono/IcePatch2/
-%{_libdir}/mono/IcePatch2/IcePatch2.dll
-%dir %{_libdir}/mono/IceStorm/
-%{_libdir}/mono/IceStorm/IceStorm.dll
-
-%{_libdir}/mono/gac/Glacier2/*
-%{_libdir}/mono/gac/Ice/*
-%{_libdir}/mono/gac/IceBox/*
-%{_libdir}/mono/gac/IceGrid/*
-%{_libdir}/mono/gac/IcePatch2/*
-%{_libdir}/mono/gac/IceStorm/*
+%{_libdir}/mono/Glacier2/
+%{_libdir}/mono/Ice/
+%{_libdir}/mono/IceBox/
+%{_libdir}/mono/IceGrid/
+%{_libdir}/mono/IcePatch2/
+%{_libdir}/mono/IceStorm/
+
+%{_libdir}/mono/gac/Glacier2
+%{_libdir}/mono/gac/Ice
+%{_libdir}/mono/gac/IceBox
+%{_libdir}/mono/gac/IceGrid
+%{_libdir}/mono/gac/IcePatch2
+%{_libdir}/mono/gac/IceStorm
 
 %{_libdir}/mono/gac/policy*
-%{_libdir}/mono/policy*
 
 %{_bindir}/iceboxnet.exe
+%doc %{_mandir}/man1/iceboxnet.exe.1.gz
 
 %files csharp-devel
 %defattr(-,root,root,-)
+%doc %{_mandir}/man1/slice2cs.1.gz
 %{_bindir}/slice2cs
 %{_libdir}/pkgconfig/Glacier2.pc
 %{_libdir}/pkgconfig/Ice.pc
@@ -492,16 +496,13 @@
 
 %files python
 %defattr(644,root,root,755)
-%ifarch x86_64 ppc64
 %{python_sitearch}/Ice/
-%{python_sitearch}/%{name}.pth
-%endif
-%{python_sitelib}/Ice/
-%{python_sitelib}/%{name}.pth
+# %{python_sitearch}/%{name}.pth
 
 %files python-devel
 %defattr(-,root,root,-)
 %{_bindir}/slice2py
+%doc %{_mandir}/man1/slice2py.1.gz
 
 %files ruby
 %defattr(644,root,root,755)
@@ -510,6 +511,7 @@
 %files ruby-devel
 %defattr(-,root,root,-)
 %{_bindir}/slice2rb
+%doc %{_mandir}/man1/slice2rb.1.gz
 
 %files php
 %defattr(-,root,root,-)
@@ -517,6 +519,15 @@
 %config(noreplace) %{_sysconfdir}/php.d/ice.ini
 
 %changelog
+* 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)
+- Incorporate patches and man pages from Debian package
+
+* Tue May 06 2008 Mary Ellen Foster <mefoster at gmail.com> 3.3-0.1.b
+- Update for 3.3 beta prerelease
+- Fix Python sitelib/sitearch issues
+
 * Fri Feb 22 2008 Mary Ellen Foster <mefoster at gmail.com> 3.2.1-17
 - Improved, less invasive patch based on the Debian one
 


