rpms/monodoc/FC-5 monodoc-patches.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 monodoc.spec, 1.9, 1.10 sources, 1.3, 1.4

[Paul F. Johnson (pfj)]

Author: pfj

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

Modified Files:
	.cvsignore monodoc.spec sources 
Added Files:
	monodoc-patches.patch 
Log Message:
auto-import monodoc-1.1.17-1 on branch FC-5 from monodoc-1.1.17-1.src.rpm

monodoc-patches.patch:

--- NEW FILE monodoc-patches.patch ---
--- monodoc-1.1.17/monodoc.pc.in	2006-07-05 23:32:49.000000000 +0100
+++ monodoc-1.1.17/monodoc.pc.in	2006-08-30 23:26:50.000000000 +0100
@@ -1,9 +1,9 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-libdir=@prefix@/lib
+libdir=@libdir@
 sourcesdir=@monodocdir@/sources
 
 Name: Monodoc
 Description: Monodoc - Mono Documentation Tools
 Version: @VERSION@
-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: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/monodoc/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	11 Jul 2006 15:28:36 -0000	1.3
+++ .cvsignore	31 Aug 2006 21:58:19 -0000	1.4
@@ -1 +1 @@
-monodoc-1.1.16.zip
+monodoc-1.1.17.zip


Index: monodoc.spec
===================================================================
RCS file: /cvs/extras/rpms/monodoc/FC-5/monodoc.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- monodoc.spec	11 Jul 2006 15:28:36 -0000	1.9
+++ monodoc.spec	31 Aug 2006 21:58:19 -0000	1.10
@@ -2,15 +2,16 @@
 
 Summary: The mono documentation system
 Name: monodoc
-Version: 1.1.16
+Version: 1.1.17
 Release: 1%{?dist}
 License: GPL
 Group: Documentation
 Source0: http://go-mono.com/sources/monodoc/monodoc-%{version}.zip
 URL: http://go-mono.com/sources/monodoc/
+Patch0: monodoc-patches.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  mono-data, mono-devel, gtk-sharp2, gtk-sharp2-gapi, pkgconfig, autoconf
-Requires: mono-core
+BuildRequires:  mono-data, mono-devel, gtk-sharp2, gtk-sharp2-gapi, pkgconfig, autoconf automake
+Requires: mono-core links
 
 %description
 monodoc is the documentation package for the mono .NET environment
@@ -18,46 +19,49 @@
 %package devel
 Summary:	.pc file for monodoc
 Group: Documentation
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{version}-%{release} pkgconfig
 
 %description devel
 Development file for monodoc
 
 %prep
 %setup -q 
+%patch0 -p1
+autoreconf
 
 %build
-export MONO_PATH=%{buildroot}/lib
-export PKG_CONFIG_PATH=%{_libdir}/pkgconfig:%{_prefix}/lib/pkgconfig/:$PKG_CONFIG_DIR
-%configure
+%configure --libdir=%{_libdir}
 make 
 
 %install
 %{__rm} -rf %{buildroot}
-export MONO_PATH=%{buildroot}/lib
 make DESTDIR=%{buildroot} install
 
+%clean
+%{__rm} -rf %{buildroot}
+
 %files
 %defattr(-, root, root)
 %doc COPYING AUTHORS ChangeLog NEWS README
-%{_prefix}/lib/mono/gac/monodoc/
-%{_prefix}/lib/mono/monodoc/
+%{_libdir}/mono/gac/monodoc/
+%{_libdir}/mono/monodoc/
 %{_libdir}/%{name}/
-%{_bindir}/mdassembler
-%{_bindir}/mdcs2ecma
-%{_bindir}/mdnormalizer
-%{_bindir}/mdvalidater
-%{_bindir}/mod
-%{_bindir}/monodoc*
+%{_bindir}/md*
+%{_bindir}/mo*
 
 %files devel
 %defattr (-, root, root)
 %{_libdir}/pkgconfig/monodoc.pc
 
-%clean
-%{__rm} -rf %{buildroot}
-
 %changelog
+* 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
+- removed some of the legacy stuff in the spec
+- globbed the bins
+- made 64 bit happy (monodoc-patches.patch)
+- added pkgconfig for the devel package
+
 * Tue Jul 11 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.1.16-1
 - bump to new version
 - changed usr-lib to prefix-lib


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/monodoc/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 Jul 2006 15:28:36 -0000	1.3
+++ sources	31 Aug 2006 21:58:19 -0000	1.4
@@ -1 +1 @@
-fe1b79236f5a44a64af9eff353cde245  monodoc-1.1.16.zip
+e4f904f23a0c7ca514403fb8ad86ff3e  monodoc-1.1.17.zip