rpms/monodoc/F-9 import.log, NONE, 1.1 monodoc-2.0-makefile.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 monodoc-patches.patch, 1.1, 1.2 monodoc.spec, 1.24, 1.25 sources, 1.9, 1.10

[Paul F. Johnson]

Author: pfj

Update of /cvs/pkgs/rpms/monodoc/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9881/F-9

Modified Files:
	.cvsignore monodoc-patches.patch monodoc.spec sources 
Added Files:
	import.log monodoc-2.0-makefile.patch 
Log Message:

Update to 2.0 



--- NEW FILE import.log ---
monodoc-2_0-5_fc10:F-9:monodoc-2.0-5.fc10.src.rpm:1225662983

monodoc-2.0-makefile.patch:

--- NEW FILE monodoc-2.0-makefile.patch ---
--- monodoc-2.0/engine/Makefile.am	2008-07-15 19:09:49.000000000 +0100
+++ monodoc-2.0/engine/Makefile-new.am	2008-08-10 14:11:16.000000000 +0100
@@ -10,11 +10,11 @@
 	Test/man-provider-test.exe*
 
 if USE_CYGPATH
-GACDIR=`cygpath -w $(prefix)/lib`
-GACROOT=`cygpath -w $(DESTDIR)$(prefix)/lib`
+GACDIR=`cygpath -w $(libdir)`
+GACROOT=`cygpath -w $(DESTDIR)$(libdir)`
 else
-GACDIR=$(prefix)/lib
-GACROOT=$(DESTDIR)$(prefix)/lib
+GACDIR=$(libdir)
+GACROOT=$(DESTDIR)$(libdir)
 endif
 
 .PHONY :  \


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/monodoc/F-9/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	16 May 2008 10:26:23 -0000	1.9
+++ .cvsignore	2 Nov 2008 21:56:52 -0000	1.10
@@ -1 +1 @@
-monodoc-1.9.zip
+monodoc-2.0.zip

monodoc-patches.patch:

Index: monodoc-patches.patch
===================================================================
RCS file: /cvs/pkgs/rpms/monodoc/F-9/monodoc-patches.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- monodoc-patches.patch	31 Aug 2006 21:56:38 -0000	1.1
+++ monodoc-patches.patch	2 Nov 2008 21:56:52 -0000	1.2
@@ -13,27 +13,3 @@
 -Libs: /r:${prefix}/lib/mono/monodoc/monodoc.dll 
 +Libs: /r:@libdir@/mono/monodoc/monodoc.dll 
 
---- monodoc-1.1.17/engine/Makefile.am	2006-07-05 23:32:10.000000000 +0100
-+++ monodoc-1.1.17/engine/Makefile.am	2006-08-30 23:27:21.000000000 +0100
-@@ -3,13 +3,13 @@
- CLEANFILES = monodoc.dll assembler.exe $(monodoc_unix_DATA) normalize.exe mod.exe validate.exe cs2ecma.exe
- DISTCLEANFILE = AssemblyInfo.cs
- 
--if USE_CYGPATH
--GACDIR=`cygpath -w $(prefix)/lib`
--GACROOT=`cygpath -w $(DESTDIR)$(prefix)/lib`
--else
--GACDIR=$(prefix)/lib
--GACROOT=$(DESTDIR)$(prefix)/lib
--endif
-+#if USE_CYGPATH
-+#GACDIR=`cygpath -w $(prefix)/lib`
-+#GACROOT=`cygpath -w $(DESTDIR)$(prefix)/lib`
-+#else
-+GACDIR=$(libdir)
-+GACROOT=$(DESTDIR)$(libdir)
-+#endif
- 
- monodoc_sources = \
-
-


Index: monodoc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monodoc/F-9/monodoc.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- monodoc.spec	16 May 2008 10:26:23 -0000	1.24
+++ monodoc.spec	2 Nov 2008 21:56:52 -0000	1.25
@@ -4,18 +4,19 @@
 
 Summary: The mono documentation system
 Name: monodoc
-Version: 1.9
-Release: 1%{?dist}
-License: GPL
+Version: 2.0
+Release: 5%{?dist}
+License: GPLv3
 Group: Documentation
 Source0: http://go-mono.com/sources-stable/monodoc-%{version}.zip
 URL: http://go-mono.com/sources/monodoc/
 Patch0: monodoc-patches.patch
+Patch1: monodoc-2.0-makefile.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  mono-data, mono-devel, gtk-sharp2-gapi, pkgconfig
+BuildRequires:  mono-data, mono-devel >= 2.0, gtk-sharp2-gapi, pkgconfig
 BuildRequires: gtk-sharp2-devel autoconf automake libtool
 Requires: mono-core links
-ExcludeArch: ppc64
+ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc alpha
 
 %description
 monodoc is the documentation package for the mono .NET environment
@@ -30,7 +31,8 @@
 
 %prep
 %setup -q 
-%patch0 -p1
+%patch0 -p1 -b .patches
+%patch1 -p1 -b .original
 autoreconf
 
 %build
@@ -54,12 +56,29 @@
 %{_bindir}/mo*
 %{_mandir}/man1/md*
 %{_mandir}/man1/monodoc*
+%{_mandir}/man5/mdoc*
 
 %files devel
 %defattr (-, root, root)
 %{monodir}/pkgconfig/monodoc.pc
 
 %changelog
+* Fri Oct 03 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0-5
+- bump to RC4
+
+* Mon Sep 29 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0-4
+- bump to RC 3
+
+* Tue Sep 09 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0-3
+- bump to 2.0 RC 1
+
+* Tue Aug 26 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0-2
+- fix license
+
+* Sun Aug 03 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 2.0-1
+- bump to 2.0 preview 1
+- spec file fixes
+
 * Mon Apr 21 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.9-1
 - bump
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/monodoc/F-9/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	16 May 2008 10:26:23 -0000	1.9
+++ sources	2 Nov 2008 21:56:52 -0000	1.10
@@ -1 +1 @@
-f42e660cd18be30a5c903e044149f0b2  monodoc-1.9.zip
+1d1be22bb55f1c2f2fc50578fddb279e  monodoc-2.0.zip