Hello community, here is the log from the commit of package ikvm checked in at Sun Mar 30 12:02:24 CEST 2008. -------- --- ikvm/ikvm.changes 2007-08-03 20:02:31.000000000 +0200 +++ /mounts/work_src_done/NOARCH/ikvm/ikvm.changes 2008-03-28 16:28:26.540519000 +0100 @@ -1,0 +2,6 @@ +Wed Mar 26 00:08:50 CET 2008 - ajorgensen@novell.com + +- Update to 0.36.0.5 +- Integrated OpenJDK Class Libraries to replace GNU Classpath + +------------------------------------------------------------------- Old: ---- ikvmbin-0.34.0.2.zip New: ---- ikvmbin-0.36.0.5.zip ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ikvm.spec ++++++ --- /var/tmp/diff_new_pack.FIE576/_old 2008-03-30 12:02:13.000000000 +0200 +++ /var/tmp/diff_new_pack.FIE576/_new 2008-03-30 12:02:13.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package ikvm (Version 0.34.0.2) +# spec file for package ikvm (Version 0.36.0.5) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -10,13 +10,14 @@ # norootforbuild + Name: ikvm -BuildRequires: dos2unix mono-core mono-devel unzip -Version: 0.34.0.2 +BuildRequires: dos2unix mono-devel unzip +Version: 0.36.0.5 Release: 1 License: BSD 3-Clause BuildArch: noarch -URL: www.ikvm.net +Url: http://www.ikvm.net Source0: ikvmbin-%{version}.zip Summary: A JVM Based on the Mono Runtime Group: Development/Tools/Other @@ -27,6 +28,8 @@ # All fedora distros (5 and 6) have the same names, requirements # Needed to generate wrapper BuildRequires: which +# Fedora options (Bug in fedora images where 'abuild' user is the same id as 'nobody') +%define env_options export MONO_SHARED_DIR=/tmp %endif ################# @@ -53,13 +56,20 @@ true %install +%{?env_options} # Create dirs mkdir -p ${RPM_BUILD_ROOT}/usr/bin mkdir -p ${RPM_BUILD_ROOT}/usr/lib/ikvm -mkdir -p ${RPM_BUILD_ROOT}/usr/lib/pkgconfig +mkdir -p ${RPM_BUILD_ROOT}/usr/share/pkgconfig #Install binaries -find bin . -name "*\.dll" -exec cp {} ${RPM_BUILD_ROOT}/usr/lib/ikvm \; -find bin . -name "*\.exe" -exec cp {} ${RPM_BUILD_ROOT}/usr/lib/ikvm \; +# (do iname for JVM.DLL) +find bin -iname "*\.dll" -exec cp {} ${RPM_BUILD_ROOT}/usr/lib/ikvm \; +find bin -name "*\.exe" -exec cp {} ${RPM_BUILD_ROOT}/usr/lib/ikvm \; +# Install some in gac (By request of Jeroen) +for i in IKVM.AWT.WinForms.dll IKVM.OpenJDK.ClassLibrary.dll IKVM.Runtime.dll ; do + gacutil -i ${RPM_BUILD_ROOT}/usr/lib/ikvm/$i -package ikvm -root ${RPM_BUILD_ROOT}/usr/lib + rm -f ${RPM_BUILD_ROOT}/usr/lib/ikvm/$i +done # Generate wrapper scripts for f in `find bin . -name "*\.exe"` ; do script_name=${RPM_BUILD_ROOT}/usr/bin/`basename $f .exe` @@ -69,23 +79,18 @@ EOF chmod 755 $script_name done +# Generate .pc file %define prot_name Name %define prot_version Version -# Generate .pc file -cat <<EOF > ${RPM_BUILD_ROOT}/usr/lib/pkgconfig/ikvm.pc +cat <<EOF > ${RPM_BUILD_ROOT}/usr/share/pkgconfig/ikvm.pc prefix=/usr exec_prefix=\${prefix} libdir=\${prefix}/lib - %prot_name: IKVM.NET Description: An implementation of Java for Mono and the Microsoft .NET Framework. - %prot_version: %{version} Libs: -r:\${libdir}/ikvm/IKVM.Runtime.dll -r:\${libdir}/ikvm/IKVM.GNU.Classpath.dll EOF -# Move .pc to share instead of lib -mkdir -p ${RPM_BUILD_ROOT}/usr/share/pkgconfig -mv ${RPM_BUILD_ROOT}/usr/lib/pkgconfig/ikvm.pc ${RPM_BUILD_ROOT}/usr/share/pkgconfig %clean rm -rf "$RPM_BUILD_ROOT" @@ -93,47 +98,49 @@ %files %defattr(-, root, root) %doc LICENSE -/usr/bin/* -/usr/lib/ikvm -/usr/share/pkgconfig/ikvm.pc -# auto dep/req generation for older distros (it will take a while for the .config scanning to get upstream) -%if 0%{?suse_version} <= 1040 || 0%{?fedora_version} <= 7 -%if 0%{?fedora_version} +%_bindir/* +%_prefix/lib/ikvm +%_prefix/lib/mono/ikvm +%_prefix/lib/mono/gac/IKVM* +%_prefix/share/pkgconfig/ikvm.pc +%if 0%{?fedora_version} || 0%{?rhel_version} # Allows overrides of __find_provides in fedora distros... (already set to zero on newer suse distros) %define _use_internal_dependency_generator 0 %endif -%define __find_provides env sh -c 'filelist=($(cat)) && { printf "%s\\n" "${filelist[@]}" | /usr/lib/rpm/find-provides && printf "%s\\n" "${filelist[@]}" | /usr/bin/mono-find-provides ; } | sort | uniq' +%define __find_provides env sh -c 'filelist=($(grep -v SharpZipLib)) && { printf "%s\\n" "${filelist[@]}" | /usr/lib/rpm/find-provides && printf "%s\\n" "${filelist[@]}" | /usr/bin/mono-find-provides ; } | sort | uniq' %define __find_requires env sh -c 'filelist=($(cat)) && { printf "%s\\n" "${filelist[@]}" | /usr/lib/rpm/find-requires && printf "%s\\n" "${filelist[@]}" | /usr/bin/mono-find-requires ; } | sort | uniq' -%endif %changelog -* Wed Aug 01 2007 - wberrier@novell.com +* Wed Mar 26 2008 ajorgensen@novell.com +- Update to 0.36.0.5 +- Integrated OpenJDK Class Libraries to replace GNU Classpath +* Wed Aug 01 2007 wberrier@novell.com - Update to 0.34.0.2 -Updated GNU Classpath -Java 1.6 updates -Several bugfixes -class coverage improvements -Interface enhancements -* Wed Apr 11 2007 - wberrier@novell.com +* Wed Apr 11 2007 wberrier@novell.com - Add mono dep/req for older distros -* Thu Apr 05 2007 - wberrier@novell.com +* Thu Apr 05 2007 wberrier@novell.com - add unzip to buildrequires (factory in buildservice requires it) -* Thu Mar 29 2007 - coolo@suse.de +* Thu Mar 29 2007 coolo@suse.de - fix BuildRequires -* Wed Oct 25 2006 - wberrier@suse.de +* Wed Oct 25 2006 wberrier@suse.de - Add mono-devel to BuildRequires so mono rpm deps and requires get generated correctly -* Wed Aug 02 2006 - wberrier@suse.de +* Wed Aug 02 2006 wberrier@suse.de - Update to 0.28.0.0 - Package from original ikvm distribution instead of using a prepackaged binary dist -* Wed Jan 25 2006 - mls@suse.de +* Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires -* Fri Dec 16 2005 - wberrier@suse.de +* Fri Dec 16 2005 wberrier@suse.de - Update to 0.22 -* Thu Oct 13 2005 - ro@suse.de +* Thu Oct 13 2005 ro@suse.de - changed mono-ikvm to mono-core in nfb -* Sat Oct 08 2005 - wberrier@suse.de +* Sat Oct 08 2005 wberrier@suse.de - Updated to 0.20 . Moved .pc file -* Fri Aug 05 2005 - wberrier@suse.de +* Fri Aug 05 2005 wberrier@suse.de - Initial package ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org