rpms/mono-tools/devel monotools-2.2-gendarme.patch, NONE, 1.1 monotools-2.2-makefiles.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 import.log, 1.7, 1.8 mono-tools.spec, 1.12, 1.13 sources, 1.4, 1.5 monotools-2.0-gendarme.patch, 1.1, NONE monotools-2.0-makefiles.patch, 1.2, NONE

Paul F. Johnson pfj at fedoraproject.org
Wed Nov 26 11:21:44 UTC 2008 

Author: pfj

Update of /cvs/pkgs/rpms/mono-tools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19677/devel

Modified Files:
	.cvsignore import.log mono-tools.spec sources 
Added Files:
	monotools-2.2-gendarme.patch monotools-2.2-makefiles.patch 
Removed Files:
	monotools-2.0-gendarme.patch monotools-2.0-makefiles.patch 
Log Message:

Updated to 2.2 preview 1 


monotools-2.2-gendarme.patch:

--- NEW FILE monotools-2.2-gendarme.patch ---
--- mono-tools-2.0/gendarme/gendarme.in	2008-07-15 19:18:57.000000000 +0100
+++ mono-tools-2.0/gendarme/gendarme-new.in	2008-08-14 18:09:50.000000000 +0100
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec @RUNTIME@ $MONO_OPTIONS $MONO_EXTRA_ARGS @prefix@/lib/gendarme/gendarme.exe "$@"
+exec @RUNTIME@ $MONO_OPTIONS $MONO_EXTRA_ARGS @libdir@/gendarme/gendarme.exe "$@"
--- mono-tools-2.0/gendarme/gendarme-wizard.in	2008-07-15 19:18:57.000000000 +0100
+++ mono-tools-2.0/gendarme/gendarme-wizard-new.in	2008-08-14 18:10:12.000000000 +0100
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec @RUNTIME@ $MONO_OPTIONS $MONO_EXTRA_ARGS @prefix@/lib/gendarme/gendarme-wizard.exe "$@"
+exec @RUNTIME@ %MONO_OPTIONS $MONO_EXTRA_ARGS @libdir@/gendarme/gendarme-wizard.exe "$@"
--- mono-tools-2.2/gendarme/console/Makefile.am	2008-11-20 20:00:15.000000000 +0000
+++ mono-tools-2.2/gendarme/console/Makefile-new.am	2008-11-20 20:06:02.000000000 +0000
@@ -1,4 +1,4 @@
-gendarmedir=$(prefix)/lib/gendarme
+gendarmedir=$(libdir)/gendarme
 gendarme_SCRIPTS = ../bin/gendarme.exe
 EXTRA_DIST = $(gendarme_sources) $(gendarme_sources_in) $(gendarme_resources) gendarme.csproj
 CLEANFILES = $(gendarme_SCRIPTS) $(gendarme_SCRIPTS).mdb
--- mono-tools-2.2/gendarme/framework/Makefile.am	2008-11-20 20:00:15.000000000 +0000
+++ mono-tools-2.2/gendarme/framework/Makefile-new.am	2008-11-20 20:05:13.000000000 +0000
@@ -4,7 +4,7 @@
 
 FRAMEWORK_OPTIONS += -nowarn:1591	# Missing XML comment
 
-frameworkdir=$(prefix)/lib/gendarme
+frameworkdir=$(libdir)/gendarme
 framework_SCRIPTS = ../bin/Gendarme.Framework.dll
 EXTRA_DIST = $(framework_sources) $(framework_sources_in) Gendarme.Framework.csproj gendarme-framework.pc.in
 CLEANFILES = $(framework_SCRIPTS) $(framework_SCRIPTS).mdb Test.Framework.dll $(framework_SCRIPTS).doc $(framework_doc)
@@ -12,14 +12,14 @@
 
 pkgconfig_in_files = gendarme-framework.pc.in
 
-pkgconfigdir= $(prefix)/lib/pkgconfig
+pkgconfigdir= $(libdir)/pkgconfig
 pkgconfig_DATA = $(pkgconfig_in_files:.pc.in=.pc)
 
 framework_doc_source = doc/Gendarme.Framework.source
 framework_doc_tree = doc/Gendarme.Framework.tree
 framework_doc_zip = doc/Gendarme.Framework.zip
 
-framework_documentationdir = $(prefix)/lib/monodoc/sources
+framework_documentationdir = $(libdir)/monodoc/sources
 framework_documentation_DATA = $(framework_doc)
 
 framework_doc = $(framework_doc_zip) $(framework_doc_source) $(framework_doc_tree)
--- mono-tools-2.2/gendarme/swf-wizard-runner/Makefile.am	2008-11-20 20:00:15.000000000 +0000
+++ mono-tools-2.2/gendarme/swf-wizard-runner/Makefile-new.am	2008-11-20 20:06:47.000000000 +0000
@@ -1,4 +1,4 @@
-wizarddir=$(prefix)/lib/gendarme
+wizarddir=$(libdir)/gendarme
 wizard_SCRIPTS = ../bin/gendarme-wizard.exe
 
 desktopdir = $(datadir)/applications

monotools-2.2-makefiles.patch:

--- NEW FILE monotools-2.2-makefiles.patch ---
--- mono-tools-2.0/asn1view/gtk/Makefile.am	2008-08-10 14:23:19.000000000 +0100
+++ mono-tools-2.0/asn1view/gtk/Makefile-new.am	2008-08-14 18:22:56.000000000 +0100
@@ -10,7 +10,7 @@
 local_flags += $(MCSFLAGS) $(GTK_SHARP_LIBS)
 
 gasnview_SCRIPTS = gasnview.exe
-gasnviewdir = $(prefix)/lib/mono/1.0
+gasnviewdir = $(libdir)/mono/1.0
 
 CLEANFILES = gasnview.exe gasnview.exe.mdb gasnview
 EXTRA_DIST = $(gasnview_sources_dist) gui.glade script.in
--- mono-tools-2.0/create-native-map/lib/pkgconfig/Makefile.am	2008-07-15 19:18:59.000000000 +0100
+++ mono-tools-2.0/create-native-map/lib/pkgconfig/Makefile-new.am	2008-08-14 18:16:05.000000000 +0100
@@ -1,5 +1,5 @@
 
-pkgconfigdir = $(prefix)/lib/pkgconfig
+pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = create-native-map.pc
 
 DISTCLEANFILES = create-native-map.pc
--- mono-tools-2.0/create-native-map/src/Makefile.am	2008-08-10 14:23:19.000000000 +0100
+++ mono-tools-2.0/create-native-map/src/Makefile-new.am	2008-08-14 18:17:03.000000000 +0100
@@ -19,7 +19,7 @@
 $(EXE) : $(cnm_build_sources)
 	$(GMCS) $(MCS_FLAGS) -d:TRACE -debug+ -out:$@ -target:exe $(REFS) $(cnm_build_sources)
 
-assemblydir = $(prefix)/lib/create-native-map
+assemblydir = $(libdir)/create-native-map
 assembly_DATA = $(EXE) MapAttribute.cs
 
 check: $(PROGRAM) TestMap.dll



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mono-tools/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	26 Aug 2008 17:38:06 -0000	1.3
+++ .cvsignore	26 Nov 2008 11:21:12 -0000	1.4
@@ -1 +1 @@
-mono-tools-2.0.tar.bz2
+mono-tools-2.2.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/mono-tools/devel/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- import.log	2 Oct 2008 23:58:17 -0000	1.7
+++ import.log	26 Nov 2008 11:21:13 -0000	1.8
@@ -5,3 +5,4 @@
 mono-tools-2_0-4_fc10:HEAD:mono-tools-2.0-4.fc10.src.rpm:1220009683
 mono-tools-2_0-5_fc10:HEAD:mono-tools-2.0-5.fc10.src.rpm:1221075751
 mono-tools-2_0-7_fc10:HEAD:mono-tools-2.0-7.fc10.src.rpm:1222991858
+mono-tools-2_2-1_pre1_fc10:HEAD:mono-tools-2.2-1.pre1.fc10.src.rpm:1227698424


Index: mono-tools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-tools/devel/mono-tools.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mono-tools.spec	27 Oct 2008 17:34:47 -0000	1.12
+++ mono-tools.spec	26 Nov 2008 11:21:13 -0000	1.13
@@ -1,24 +1,24 @@
 %define debug_package %{nil}
 
-Summary: The mono documentation system
+Summary: A collection of tools for mono applications
 Name: mono-tools
-Version: 2.0
-Release: 8%{?dist}
+Version: 2.2
+Release: 1.pre1%{?dist}
 License: MIT
 Group: Development/Tools
-Patch0: monotools-2.0-gendarme.patch
+Patch0: monotools-2.2-gendarme.patch
 Patch1: monotools-2.0-gendarmepc.patch
 Patch2: monotools-2.0-infiles.patch
-Patch3: monotools-2.0-makefiles.patch
+Patch3: monotools-2.2-makefiles.patch
 Source0: http://go-mono.com/sources/%{name}/%{name}-%{version}.tar.bz2
 URL: http://go-mono.com/sources-latests
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  mono-data, mono-devel >= 2.0, gtk-sharp2-gapi, pkgconfig mono-nunit
-BuildRequires: monodoc-devel >= 2.0 gecko-sharp2-devel gnome-sharp-devel, gettext-devel
+BuildRequires:  mono-data, mono-devel >= 2.2, gtk-sharp2-gapi, pkgconfig mono-nunit
+BuildRequires: gecko-sharp2-devel gnome-sharp-devel, gettext-devel
 BuildRequires: gtk-sharp2-devel autoconf automake libtool mono-nunit-devel
 BuildRequires: hunspell-devel desktop-file-utils gnome-desktop-sharp-devel
-BuildRequires: mono-jscript mono-data-oracle
-Requires: mono-core links monodoc >= 2.0
+BuildRequires: mono-jscript mono-data-oracle monodoc-devel
+Requires: mono-core links monodoc
 
 ExclusiveArch: %ix86 x86_64 ia64 armv4l sparc alpha
 
@@ -28,12 +28,20 @@
 
 %package devel
 Summary: .pc file for mono-tools
-Group: Documentation
+Group: Development/Languages
 Requires: %{name} = %{version}-%{release} pkgconfig
 
 %description devel
 Development file for mono-tools
 
+%package monodoc
+Summary: monodoc documentation
+Group: Documentation
+Requires: %{name} = %{version}-%{release} monodoc
+
+%description monodoc
+Documentation for monotools for use with monodoc
+
 %prep
 %setup -q 
 sed -i -e 's!@libdir@!%{_libdir}!' %PATCH0 
@@ -89,10 +97,14 @@
 %{_bindir}/gui-compare
 %{_bindir}/gendarme*
 %{_bindir}/mprof*
+%{_bindir}/gsharp
+%{_bindir}/mperfmon
+%{_libdir}/gsharp/gsharp.exe
 %{_libdir}/gendarme/*.dll
 %{_libdir}/gendarme/*.exe
 %{_libdir}/gendarme/*.xml
 %{_libdir}/create-native-map
+%{_libdir}/mperfmon/*
 %dir %{_libdir}/gui-compare
 %{_libdir}/gui-compare/gui-compare.exe
 %exclude %{_libdir}/gui-compare/*.dll
@@ -110,17 +122,25 @@
 %{_mandir}/man1/create-native-map.1.gz
 %{_datadir}/pixmaps/ilcontrast.png
 %{_datadir}/pixmaps/monodoc.png
+%{_datadir}/pixmaps/gendarme.svg
 %{_datadir}/applications/*.desktop
 %{_libdir}/monodoc/MonoWebBrowserHtmlRender.dll
 %{_mandir}/man1/gendarme*
+%{_mandir}/man1/mperfmon*
 
 %files devel
 %defattr(-, root, root,-)
 %{_libdir}/pkgconfig/*.pc
 
+%files monodoc
+%defattr(-,root,root,-)
+%{_libdir}/monodoc/sources/Gendarme*
+
 %changelog
-* Mon Oct 27 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.0-8
-- rebuild for new gnome-sharp
+* Thu Nov 20 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 2.2-1.pre1
+- bump to 2.2 preview 1
+- fix patch files
+- branch off monodoc documentation
 
 * Wed Oct 03 2008 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 2.0-7
 - bump to rc3


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mono-tools/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	10 Sep 2008 19:44:04 -0000	1.4
+++ sources	26 Nov 2008 11:21:13 -0000	1.5
@@ -1 +1 @@
-955025ab9b25bc58058facc39ab88aae  mono-tools-2.0.tar.bz2
+a6f54f3bf46efec04a877f682633d746  mono-tools-2.2.tar.bz2


--- monotools-2.0-gendarme.patch DELETED ---


--- monotools-2.0-makefiles.patch DELETED ---

More information about the fedora-extras-commits mailing list