rpms/monodevelop/FC-5 monodevelop.spec,1.4,1.5

[Paul F. Johnson (pfj)]

Author: pfj

Update of /cvs/extras/rpms/monodevelop/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26997/FC-5

Modified Files:
	monodevelop.spec 
Log Message:
auto-import monodevelop-0.11-21 on branch FC-5 from monodevelop-0.11-21.src.rpm


Index: monodevelop.spec
===================================================================
RCS file: /cvs/extras/rpms/monodevelop/FC-5/monodevelop.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- monodevelop.spec	4 Sep 2006 20:03:21 -0000	1.4
+++ monodevelop.spec	4 Sep 2006 21:46:46 -0000	1.5
@@ -1,20 +1,28 @@
+%if "%{fedora}" == "5"
+%define monodir %{_prefix}/lib
+%else
+%define monodir %{_libdir}
+%endif
+
 Summary: A full-featured IDE for Mono and Gtk sharp
 Name: monodevelop
 Version: 0.11
-Release: 20%{?dist}
+Release: 21%{?dist}
 License: GPL
 Group: Development/Tools
 Source0: http://go-mono.com/sources/%{name}/%{name}-%{version}.tar.gz
 URL: http://go-mono.com/sources/%{name}/
+%if "%{fedora}" > "5"
 Patch0: monodevelop-config.patch
 Patch1: monodevelop-r62648.patch
+%endif
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: mono-devel, gtk-sharp2, intltool, gettext, bytefx-data-mysql,  mono-data-postgresql, mono-data-oracle, mono-data-sqlite, mono-data-sybase, mono-nunit, gtk-sharp2-gapi, shared-mime-info, pkgconfig, gtksourceview-sharp-devel, monodoc-devel, ikvm-devel gnome-sharp-devel gtk-sharp2-devel
-BuildRequires: autoconf, automake, libtool
+BuildRequires: mono-devel, gtk-sharp2, intltool, gettext, bytefx-data-mysql,  mono-data-postgresql, mono-data-oracle, mono-data-sqlite, mono-data-sybase, mono-nunit, gtk-sharp2-gapi, shared-mime-info, pkgconfig, gtksourceview-sharp-devel, monodoc-devel, ikvm-devel
 %if "%{?fedora}" == "5"
-BuildRequires: gecko-sharp2
+BuildRequires: gecko-sharp2 gtk-sharp2
 %else
-BuildRequires: gecko-sharp2-devel
+BuildRequires: gecko-sharp2-devel gtk-sharp2-devel gnome-sharp-devel
+BuildRequires: autoconf libtool automake
 %endif
 
 Requires: mono-core, ikvm, boo, monodoc, gecko-sharp2, gtksourceview-sharp bytefx-data-mysql mono-nunit mono-data-postgresql mono-data-sybase mono-data-oracle
@@ -37,12 +45,14 @@
 
 %prep
 %setup -q 
+%if "%{fedora}" > "5"
 %patch0 -p1
 %patch1 -p1
 autoreconf
+%endif
 
 %build
-%configure --enable-boo --enable-java --enable-versioncontrol --libdir=%{_libdir}
+%configure --enable-boo --enable-java --enable-versioncontrol --libdir=%{monodir}
 make
 # no smp flags as it falls over during the build (race condition)
 
@@ -69,7 +79,7 @@
 %{_bindir}/mdtool
 %{_bindir}/monodevelop
 %doc AUTHORS COPYING ChangeLog README
-%{_libdir}/monodevelop/
+%{monodir}/monodevelop/
 %exclude %{_datadir}/mime/XMLnamespaces
 %exclude %{_datadir}/mime/aliases
 %{_datadir}/mime/globs
@@ -84,12 +94,15 @@
 
 %files devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/monodevelop.pc
+%{monodir}/pkgconfig/monodevelop.pc
 
 %clean
 %{__rm} -rf %{buildroot}
 
 %changelog
+* Mon Sep 04 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.11-21
+- Revert 64 bit clean for FC-5 and still follow FC guidelines
+
 * Sun Sep 03 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.11-20
 - Added gtk sharp fix
 - Added conditional so it builds for FC5