rpms/monodoc/devel monodoc.spec,1.10,1.11

[Paul F. Johnson (pfj)]

Author: pfj

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

Modified Files:
	monodoc.spec 
Log Message:
auto-import monodoc-1.1.17-2 on branch devel from monodoc-1.1.17-2.src.rpm


Index: monodoc.spec
===================================================================
RCS file: /cvs/extras/rpms/monodoc/devel/monodoc.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- monodoc.spec	31 Aug 2006 21:56:38 -0000	1.10
+++ monodoc.spec	4 Sep 2006 21:40:10 -0000	1.11
@@ -1,14 +1,22 @@
 %define debug_package %{nil}
 
+%if "%{fedora}" == "5"
+%define monodir %{_prefix}/lib
+%else
+%define monodir %{_libdir}
+%endif
+
 Summary: The mono documentation system
 Name: monodoc
 Version: 1.1.17
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Documentation
 Source0: http://go-mono.com/sources/monodoc/monodoc-%{version}.zip
 URL: http://go-mono.com/sources/monodoc/
+%if "%{fedora}" > "5"
 Patch0: monodoc-patches.patch
+%endif
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  mono-data, mono-devel, gtk-sharp2, gtk-sharp2-gapi, pkgconfig, autoconf automake
 Requires: mono-core links
@@ -26,11 +34,13 @@
 
 %prep
 %setup -q 
+%if "%{fedora}" > "5"
 %patch0 -p1
 autoreconf
+%endif
 
 %build
-%configure --libdir=%{_libdir}
+%configure --libdir=%{monodir}
 make 
 
 %install
@@ -43,17 +53,20 @@
 %files
 %defattr(-, root, root)
 %doc COPYING AUTHORS ChangeLog NEWS README
-%{_libdir}/mono/gac/monodoc/
-%{_libdir}/mono/monodoc/
-%{_libdir}/%{name}/
+%{monodir}/mono/gac/monodoc/
+%{monodir}/mono/monodoc/
+%{monodir}/%{name}/
 %{_bindir}/md*
 %{_bindir}/mo*
 
 %files devel
 %defattr (-, root, root)
-%{_libdir}/pkgconfig/monodoc.pc
+%{monodir}/pkgconfig/monodoc.pc
 
 %changelog
+* Mon Sep 04 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.1.17-2
+- Reverts 64 bit clean for FC-5 while still obeying the packaging rules
+
 * Wed Aug 30 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.1.17-1
 - bump to next version
 - added R links