rpms/ikvm/devel ikvm-libdir.patch, NONE, 1.1 ikvm.spec, 1.4, 1.5 ikvm-scripts.patch, 1.1, NONE needs.rebuild, 1.1, NONE

[Paul F. Johnson (pfj)]

Author: pfj

Update of /cvs/extras/rpms/ikvm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32734/devel

Modified Files:
	ikvm.spec 
Added Files:
	ikvm-libdir.patch 
Removed Files:
	ikvm-scripts.patch needs.rebuild 
Log Message:
auto-import ikvm-0.22-10 on branch devel from ikvm-0.22-10.src.rpm

ikvm-libdir.patch:

--- NEW FILE ikvm-libdir.patch ---
--- ikvm-0.22/scripts/ikvm.in	2005-12-16 03:29:34.000000000 +0000
+++ ikvm-0.22/scripts/ikvm-new.in	2006-09-06 22:28:23.000000000 +0100
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec @RUNTIME@ @prefix@/lib/ikvm/ikvm.exe "$@"
+exec @RUNTIME@ @libdir@/ikvm/ikvm.exe "$@"

--- ikvm-0.22/scripts/ikvmc.in	2005-12-16 03:29:34.000000000 +0000
+++ ikvm-0.22/scripts/ikvmc-new.in	2006-09-06 22:29:49.000000000 +0100
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec @RUNTIME@ @prefix@/lib/ikvm/ikvmc.exe "$@"
+exec @RUNTIME@ @libdir@/ikvm/ikvmc.exe "$@"

--- ikvm-0.22/scripts/ikvmstub.in	2005-12-16 03:29:34.000000000 +0000
+++ ikvm-0.22/scripts/ikvmstub-new.in	2006-09-06 22:29:08.000000000 +0100
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec @RUNTIME@ @prefix@/lib/ikvm/ikvmstub.exe "$@"
+exec @RUNTIME@ @libdir@/ikvm/ikvmstub.exe "$@"

--- ikvm-0.22/bin/Makefile.am	2005-12-16 03:29:34.000000000 +0000
+++ ikvm-0.22/bin/Makefile-new.am	2006-09-06 22:27:08.000000000 +0100
@@ -1,4 +1,4 @@
-exedir = $(prefix)/lib/ikvm
+exedir = $(libdir)/ikvm
 exe_SCRIPTS = ikvmc.exe ikvm.exe ikvmstub.exe
 
 EXTRA_DIST = ikvmc.exe ikvm.exe ikvmstub.exe

--- ikvm-0.22/Makefile.am	2005-12-16 03:29:34.000000000 +0000
+++ ikvm-0.22/Makefile-new.am	2006-09-06 22:26:48.000000000 +0100
@@ -2,7 +2,7 @@
 
 SUBDIRS = bin lib scripts
 
-pkgconfdir = $(prefix)/lib/pkgconfig
+pkgconfdir = $(libdir)/pkgconfig
 pkgconf_DATA = ikvm.pc
 
 DISTCLEANFILES = ikvm.pc

--- ikvm-0.22/ikvm.pc.in	2005-12-16 03:29:34.000000000 +0000
+++ ikvm-0.22/ikvm-new.pc.in	2006-09-06 22:26:28.000000000 +0100
@@ -1,9 +1,9 @@
 prefix=@prefix@
 exec_prefix=${prefix}
-libdir=${prefix}/lib
+libdir=@libdir@
 
 
 Name: IKVM.NET
 Description: An implementation of Java for Mono and the Microsoft .NET Framework.
 Version: @VERSION@
-Libs: -r:${libdir}/ikvm/IKVM.Runtime.dll -r:${libdir}/ikvm/IKVM.GNU.Classpath.dll
\ No newline at end of file
+Libs: -r:${libdir}/ikvm/IKVM.Runtime.dll -r:${libdir}/ikvm/IKVM.GNU.Classpath.dll

--- ikvm-0.22/lib/Makefile.am	2005-12-16 03:29:34.000000000 +0000
+++ ikvm-0.22/lib/Makefile-new.am	2006-09-06 22:50:56.000000000 +0100
@@ -1,4 +1,4 @@
-dlldir = $(prefix)/lib/ikvm
+dlldir = $(libdir)/ikvm
 
 dll_SCRIPTS = IKVM.AWT.WinForms.dll \
             IKVM.GNU.Classpath.dll \


Index: ikvm.spec
===================================================================
RCS file: /cvs/extras/rpms/ikvm/devel/ikvm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ikvm.spec	14 Jun 2006 21:42:39 -0000	1.4
+++ ikvm.spec	6 Sep 2006 22:59:50 -0000	1.5
@@ -1,18 +1,25 @@
-%define _libdir %{_exec_prefix}/lib
 %define debug_package %{nil}
 
+%if "%{?fedora}" == "5"
+%define monodir %{_prefix}/lib
+%else
+%define monodir %{_libdir}
+%endif
+
 Summary: An implementation of Java for Mono
 Name: ikvm
 Version: 0.22
-Release: 8%{?dist}
+Release: 10%{?dist}
 License: BSD
 Group: Development/Languages
-Source0: http://go-mono.com/sources/%{name}/%{name}-%{version}.tar.gz
-Patch0: ikvm-scripts.patch
+Source0: http://kent.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
+Patch0: ikvm-libdir.patch
 URL: http://www.ikvm.net/
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  mono-devel, dos2unix, pkgconfig
-Requires: mono-core
+BuildRequires:  mono-devel
+%if "%{?fedora}" > "5"
+BuildRequires: libtool autoconf automake
+%endif
 
 %description
 This package provides IKVM.NET, an open source Java compatibility
@@ -23,24 +30,24 @@
 %package devel
 Summary:	Development files for ikvm
 Group:	Development/Libraries
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release} pkgconfig
 
 %description devel
 Development files for ikvm
 
 %prep
-rm -rf %{RPM_BUILD_ROOT}
 %setup -q
-%patch0 -p1 -b .patch0
+sed -i 's/\r//' LICENSE
+%if "%{?fedora}" > "5"
+%patch0 -p1 -b .orig
+autoreconf
+%endif
 
 %build
-export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
 %configure
 make %{?_smp_mflags}
-dos2unix LICENSE
 
 %install
-export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
 %{__rm} -rf %{buildroot}
 make DESTDIR=%{buildroot} install
 
@@ -48,16 +55,25 @@
 %defattr (-,root,root,-)
 %doc LICENSE COPYING
 %{_bindir}/*
-%{_libdir}/ikvm/
+%{monodir}/ikvm/
 
 %files devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/ikvm.pc
+%{monodir}/pkgconfig/ikvm.pc
 
 %clean
 %{__rm} -rf %{buildroot}
 
 %changelog
+* Wed Sep 06 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.22-10
+- 64 bit clean
+- spec file changes
+
+* Wed Jun 14 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.22-9
+- Altered configure line so there is a valid target
+- Changed buildarch to noarch
+- Removed libdir hack
+
 * Wed Jun 14 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.22-8
 - Add BR pkg-config
 


--- ikvm-scripts.patch DELETED ---


--- needs.rebuild DELETED ---