- updated to 4.2

- removed obsolete build,sdkver patches

diff --git a/mono-tools-build.patch b/mono-tools-build.patch
deleted file mode 100644 (file)
index 462e0ce..0000000
--- a/mono-tools-build.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- mono-tools-3.10/webdoc/Makefile.am.orig    2014-10-04 11:56:43.000000000 +0200
-+++ mono-tools-3.10/webdoc/Makefile.am 2014-11-25 16:44:07.806396575 +0100
-@@ -22,18 +22,13 @@
-       $(wildcard App_Code/Plugins/*.cs) \
-       $(wildcard views/*.css) \
-       $(wildcard views/*.js) \
--      $(wildcard views/*.html) \
-       $(wildcard views/images/*.png) \
--      $(wildcard views/images/*.gif) \
-       $(wildcard skins/mono-external/header*) \
-       $(wildcard skins/mono-external/footer*) \
-       $(wildcard skins/mono-external/*.css) \
--      $(wildcard skins/mono-external/*.js) \
-       $(wildcard skins/mono-external/images/*.png) \
-       $(wildcard skins/mono-external/images/*.gif) \
-       $(wildcard plugins/iframe-plugin/*.js) \
--        $(wildcard plugins/iframe-plugin/*.css) \
--        $(wildcard plugins/iframe-plugin/*.html) \
-       $(wildcard plugins/tooltip-plugin/*.js) \
-       $(wildcard plugins/sidebar-plugin/*.js) \
-         $(wildcard plugins/sidebar-plugin/*.css) \
-@@ -117,18 +116,13 @@
-        $(INSTALL_DATA) $(srcdir)/App_Code/Plugins/*cs                                         $(DESTDIR)$(webdir)/App_Code/Plugins
-        $(INSTALL_DATA) $(srcdir)/views/*css                                                   $(DESTDIR)$(webdir)/views
-        $(INSTALL_DATA) $(srcdir)/views/*js                                                    $(DESTDIR)$(webdir)/views
--       $(INSTALL_DATA) $(srcdir)/views/*html                                                  $(DESTDIR)$(webdir)/views
-        $(INSTALL_DATA) $(srcdir)/views/images/*png                                            $(DESTDIR)$(webdir)/views/images
--       $(INSTALL_DATA) $(srcdir)/views/images/*gif                                            $(DESTDIR)$(webdir)/views/images
-        $(INSTALL_DATA) $(srcdir)/skins/mono-external/header*                                  $(DESTDIR)$(webdir)/skins/mono-external
-        $(INSTALL_DATA) $(srcdir)/skins/mono-external/footer*                                  $(DESTDIR)$(webdir)/skins/mono-external
-        $(INSTALL_DATA) $(srcdir)/skins/mono-external/*css                                     $(DESTDIR)$(webdir)/skins/mono-external
--       $(INSTALL_DATA) $(srcdir)/skins/mono-external/*js                                      $(DESTDIR)$(webdir)/skins/mono-external
-        $(INSTALL_DATA) $(srcdir)/skins/mono-external/images/*png                              $(DESTDIR)$(webdir)/skins/mono-external/images
-        $(INSTALL_DATA) $(srcdir)/skins/mono-external/images/*gif                              $(DESTDIR)$(webdir)/skins/mono-external/images
--       $(INSTALL_DATA) $(srcdir)/plugins/iframe-plugins/*css                                  $(DESTDIR)$(webdir)/plugins/iframe-plugin
-        $(INSTALL_DATA) $(srcdir)/plugins/iframe-plugin/*js                                    $(DESTDIR)$(webdir)/plugins/iframe-plugin
--       $(INSTALL_DATA) $(srcdir)/plugins/iframe-plugin/*html                                  $(DESTDIR)$(webdir)/plugins/iframe-plugin
-        $(INSTALL_DATA) $(srcdir)/plugins/tooltip-plugin/*js                                    $(DESTDIR)$(webdir)/plugins/tooltip-plugin
-        $(INSTALL_DATA) $(srcdir)/plugins/sidebar-plugin/*css                                  $(DESTDIR)$(webdir)/plugins/sidebar-plugin
-        $(INSTALL_DATA) $(srcdir)/plugins/sidebar-plugin/*js                                   $(DESTDIR)$(webdir)/plugins/sidebar-plugin

diff --git a/mono-tools-sdkver.patch b/mono-tools-sdkver.patch
deleted file mode 100644 (file)
index 76a36dd..0000000
--- a/mono-tools-sdkver.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Don't force sdk 2 (through gmcs), e.g. gtk-sharp 2.12 uses sdk 4 cairo.
---- mono-tools-2.10/mperfmon/Makefile.am.orig  2011-02-12 17:32:47.000000000 +0100
-+++ mono-tools-2.10/mperfmon/Makefile.am       2014-01-11 11:28:30.148463700 +0100
-@@ -29,5 +29,5 @@
- ress= $(foreach res,$(mperfmon_resources), $(addprefix -resource:,$(res)),$(notdir $(res)))
- 
- mperfmon.exe: $(mperfmon_sources) $(mperfmon_resources)
--      $(GMCS) -noconfig -codepage:utf8 -warn:4 -optimize+ -debug -define:DEBUG -target:exe -out:mperfmon.exe $(mperfmon_sources) $(ress) $(packages) $(assemblies)
-+      $(MCS) -noconfig -codepage:utf8 -warn:4 -optimize+ -debug -define:DEBUG -target:exe -out:mperfmon.exe $(mperfmon_sources) $(ress) $(packages) $(assemblies)
- 
---- mono-tools-2.10/Mono.Profiler/Mono.Profiler.Widgets/Makefile.am.orig       2014-01-11 14:36:07.162081890 +0100
-+++ mono-tools-2.10/Mono.Profiler/Mono.Profiler.Widgets/Makefile.am    2014-01-11 14:50:26.770500642 +0100
-@@ -56,7 +56,7 @@
- 
- $(ASSEMBLY) $(ASSEMBLY_MDB): $(build_sources) $(build_resources)
-       mkdir -p $(BUILDDIR)
--      $(GMCS) $(CSFLAGS) -out:$(ASSEMBLY) -target:library $(build_sources) $(build_resources_args) $(build_references)
-+      $(MCS) $(CSFLAGS) -out:$(ASSEMBLY) -target:library $(build_sources) $(build_resources_args) $(build_references)
- 
- EXTRA_DIST = Mono.Profiler.Widgets.csproj $(FILES) $(RESOURCES)
- 

diff --git a/mono-tools.spec b/mono-tools.spec
index 91b5d2c334dc7ae5ec1cefbe3cfc7390ae7fe189..5df9178491ed9e310a48c6f507e7c2e0c71cf214 100644 (file)
--- a/mono-tools.spec
+++ b/mono-tools.spec
@@ -6,18 +6,16 @@
 Summary:       Mono Tools
 Summary(pl.UTF-8):     Narzędzia do mono
 Name:          mono-tools
-Version:       3.10
+Version:       4.2
 Release:       1
 License:       GPL v2+
 Group:         Development/Tools
-#Source0:      http://download.mono-project.com/sources/mono-tools/%{name}-%{version}.tar.gz
-# 3.10 tarball is broken, temporarily use github
-Source0:       https://github.com/mono/mono-tools/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 8df1eed41d5ff6dc6d48541f1c593319
-Patch0:                %{name}-build.patch
-Patch1:                %{name}-pwd.patch
-Patch2:                %{name}-configure.patch
-Patch3:                %{name}-sdkver.patch
+# also available on github
+#Source0:      https://github.com/mono/mono-tools/archive/%{version}/%{name}-%{version}.tar.gz
+Source0:       http://download.mono-project.com/sources/mono-tools/%{name}-%{version}.tar.gz
+# Source0-md5: d4b7c711ff8295173766c44973c6c10e
+Patch0:                %{name}-pwd.patch
+Patch1:                %{name}-configure.patch
 URL:           http://www.mono-project.com/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -156,13 +154,11 @@ zawartości.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 # as expected by ilcontrast script
 %{__sed} -i -e 's,\$(libdir)/ilcontrast,$(prefix)/lib/ilcontrast,' ilcontrast/Makefile.am
 
-# mono-2.8 path for gasnview.exe
+# mono-2.8+ path for gasnview.exe
 %{__sed} -i -e 's,mono/1.0,mono/2.0,' asn1view/gtk/Makefile.am
 
 %build