rpms/monodoc/devel import.log, NONE, 1.1 monodoc-2.0-makefile.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 monodoc-patches.patch, 1.2, 1.3 monodoc.spec, 1.25, 1.26 sources, 1.9, 1.10

[Paul F. Johnson]

Author: pfj

Update of /cvs/pkgs/rpms/monodoc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14913/devel

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

Bump to 2.0 preview
Alter license 



--- NEW FILE import.log ---
monodoc-2_0-1_fc10:HEAD:monodoc-2.0-1.fc10.src.rpm:1219762945

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/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	23 Apr 2008 09:13:38 -0000	1.9
+++ .cvsignore	26 Aug 2008 15:03:13 -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/devel/monodoc-patches.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- monodoc-patches.patch	11 Aug 2008 15:32:06 -0000	1.2
+++ monodoc-patches.patch	26 Aug 2008 15:03:13 -0000	1.3
@@ -13,21 +13,3 @@
 -Libs: /r:${prefix}/lib/mono/monodoc/monodoc.dll 
 +Libs: /r:@libdir@/mono/monodoc/monodoc.dll 
 
---- monodoc-1.9/engine/Makefile.am.BAD	2008-08-11 11:23:41.000000000 -0400
-+++ monodoc-1.9/engine/Makefile.am	2008-08-11 11:24:55.000000000 -0400
-@@ -4,11 +4,11 @@ CLEANFILES = monodoc.dll assembler.exe $
- DISTCLEANFILE = AssemblyInfo.cs
- 
- 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
- 
- monodoc_sources = \


Index: monodoc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monodoc/devel/monodoc.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- monodoc.spec	11 Aug 2008 15:32:06 -0000	1.25
+++ monodoc.spec	26 Aug 2008 15:03:13 -0000	1.26
@@ -4,19 +4,19 @@
 
 Summary: The mono documentation system
 Name: monodoc
-Version: 1.9
-Release: 2%{?dist}
-# No version specified. Most source files missing license attribution.
-License: GPL+
+Version: 2.0
+Release: 1%{?dist}
+License: GPL
 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
@@ -31,7 +31,8 @@
 
 %prep
 %setup -q 
-%patch0 -p1
+%patch0 -p1 -b .patches
+%patch1 -p1 -b .original
 autoreconf
 
 %build
@@ -55,14 +56,16 @@
 %{_bindir}/mo*
 %{_mandir}/man1/md*
 %{_mandir}/man1/monodoc*
+%{_mandir}/man5/mdoc*
 
 %files devel
 %defattr (-, root, root)
 %{monodir}/pkgconfig/monodoc.pc
 
 %changelog
-* Mon Aug 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.9-2
-- fix license tag
+* 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/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	23 Apr 2008 09:13:38 -0000	1.9
+++ sources	26 Aug 2008 15:03:13 -0000	1.10
@@ -1 +1 @@
-f42e660cd18be30a5c903e044149f0b2  monodoc-1.9.zip
+1d1be22bb55f1c2f2fc50578fddb279e  monodoc-2.0.zip