[packages/mono-addins] - updated to 1.0 (from github) - updated monodir patch, removed obsolete automake patch - added buil

qboosh qboosh at pld-linux.org
Tue Jan 7 21:45:01 CET 2014 

commit 0e6837a3afc25e4eb20c8acdd252033b37bd0e62
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Tue Jan 7 21:45:42 2014 +0100

    - updated to 1.0 (from github)
    - updated monodir patch, removed obsolete automake patch
    - added build patch (fixes gtk-sharp2 vs cairo version mismatch)
    - build monodocs, added destdir patch to fix install

 mono-addins-automake.patch  | 13 -------------
 mono-addins-build.patch     | 12 ++++++++++++
 mono-addins-monodir.patch   | 39 +++++++++++++++++++--------------------
 mono-addins-pkglibdir.patch | 30 ------------------------------
 mono-addins.spec            | 44 +++++++++++++++++++++++++++++++++-----------
 5 files changed, 64 insertions(+), 74 deletions(-)
---
diff --git a/mono-addins.spec b/mono-addins.spec
index 3316ea9..faecc69 100644
--- a/mono-addins.spec
+++ b/mono-addins.spec
@@ -1,23 +1,32 @@
+#
+# Conditional build:
+%bcond_without	monodoc	# monodoc documentation
+%bcond_with	tests	# "make test" call [fails on UnitTests load???]
+#
 %include	/usr/lib/rpm/macros.mono
 Summary:	Mono.Addins - framework for creating extensible applications and libraries
 Summary(pl.UTF-8):	Mono.Addins - framework do tworzenia elastycznych aplikacji i bibliotek
 Name:		mono-addins
-Version:	0.6.2
-Release:	2
+Version:	1.0
+Release:	1
 License:	MIT
 Group:		Development/Tools
-# latest downloads summary at http://download.mono-project.com/sources-stable/
-Source0:	http://download.mono-project.com/sources/mono-addins/%{name}-%{version}.tar.bz2
-# Source0-md5:	afbbe5e9fdf9b03911bc8e6b94feb60b
+# latest is 0.6.2 here
+#Source0:	http://download.mono-project.com/sources/mono-addins/%{name}-%{version}.tar.bz2
+# newer releases available on http://monoaddins.codeplex.com/ (requiring JS and POST forms) or github
+Source0:	https://github.com/mono/mono-addins/archive/mono-addins-1.0.tar.gz
+# Source0-md5:	d4c87fbfd46584a0f1fb56169e78f6d7
 Patch0:		%{name}-monodir.patch
-Patch1:		%{name}-automake.patch
+Patch1:		%{name}-build.patch
+Patch2:		%{name}-destdir.patch
 URL:		http://www.mono-project.com/Mono.Addins
 BuildRequires:	autoconf >= 2.54
 BuildRequires:	automake >= 1:1.7
 BuildRequires:	dotnet-gtk-sharp2-devel >= 2.9.0
 BuildRequires:	mono-csharp >= 1.1.13
-# for --enable-docs, which fails
-#BuildRequires:	mono-monodoc
+# mono-nunit
+%{?with_tests:BuildRequires:	mono-devel}
+%{?with_monodoc:BuildRequires:	mono-monodoc}
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.311
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -49,17 +58,23 @@ Mono.Addins development files.
 Pliki programistyczne Mono.Addins.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{name}-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__aclocal}
 %{__automake}
 %{__autoconf}
-%configure
+%configure \
+	%{?with_monodoc:--enable-docs} \
+	%{?with_tests:--enable-tests}
+
 %{__make} -j1
 
+%{?with_tests:%{__make} -C Test test}
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -100,6 +115,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_prefix}/lib/mono/gac/policy.0.5.Mono.Addins.Gui
 %{_prefix}/lib/mono/gac/policy.0.5.Mono.Addins.MSBuild
 %{_prefix}/lib/mono/gac/policy.0.5.Mono.Addins.Setup
+%{_prefix}/lib/mono/gac/policy.0.6.Mono.Addins
+%{_prefix}/lib/mono/gac/policy.0.6.Mono.Addins.CecilReflector
+%{_prefix}/lib/mono/gac/policy.0.6.Mono.Addins.Gui
+%{_prefix}/lib/mono/gac/policy.0.6.Mono.Addins.MSBuild
+%{_prefix}/lib/mono/gac/policy.0.6.Mono.Addins.Setup
 %{_mandir}/man1/mautil.1*
 
 %files devel
@@ -109,7 +129,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_prefix}/lib/mono/mono-addins/Mono.Addins.Gui.dll
 %{_prefix}/lib/mono/mono-addins/Mono.Addins.MSBuild.dll
 %{_prefix}/lib/mono/mono-addins/Mono.Addins.Setup.dll
-%{_prefix}/lib/mono/xbuild/Mono.Addins.targets
+%if %{with monodoc}
+%{_prefix}/lib/monodoc/sources/mono-addins-docs.*
+%endif
 %{_pkgconfigdir}/mono-addins.pc
 %{_pkgconfigdir}/mono-addins-gui.pc
 %{_pkgconfigdir}/mono-addins-msbuild.pc
diff --git a/mono-addins-automake.patch b/mono-addins-automake.patch
deleted file mode 100644
index 0d0b5a3..0000000
--- a/mono-addins-automake.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- mono-addins-0.6.2/mautil/Makefile.am.pld	2012-03-20 17:40:53.865786609 +0100
-+++ mono-addins-0.6.2/mautil/Makefile.am	2012-03-20 17:41:02.635739097 +0100
-@@ -36,8 +36,8 @@ $(ASSEMBLY): $(build_sources) $(build_re
- 
- include $(top_srcdir)/Makefile.include
- 
--pkglibdir = $(prefix)/lib/mono/mono-addins
--pkglib_SCRIPTS = $(ASSEMBLY) $(build_datafiles)
-+pkgdatadir = $(prefix)/lib/mono/mono-addins
-+pkgdata_SCRIPTS = $(ASSEMBLY) $(build_datafiles)
- 
- man_MANS = mautil.1
- EXTRA_DIST += $(man_MANS)
diff --git a/mono-addins-build.patch b/mono-addins-build.patch
new file mode 100644
index 0000000..6cf0342
--- /dev/null
+++ b/mono-addins-build.patch
@@ -0,0 +1,12 @@
+Disable lower TargetFrameworkVersion forcing to avoid compatibility problems
+between gtk-sharp compiled with latest Cairo and older Cairo for mono < 4.5.
+--- mono-addins-mono-addins-1.0/Mono.Addins.Gui/Mono.Addins.Gui.csproj.orig	2014-01-07 21:11:14.359992561 +0100
++++ mono-addins-mono-addins-1.0/Mono.Addins.Gui/Mono.Addins.Gui.csproj	2014-01-07 21:11:23.459992181 +0100
+@@ -11,7 +11,6 @@
+     <RootNamespace>Mono.Addins.Gui</RootNamespace>
+     <SignAssembly>True</SignAssembly>
+     <AssemblyOriginatorKeyFile>..\mono-addins.snk</AssemblyOriginatorKeyFile>
+-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+   </PropertyGroup>
+   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+     <DebugSymbols>True</DebugSymbols>
diff --git a/mono-addins-monodir.patch b/mono-addins-monodir.patch
index 64f6e55..93a5acb 100644
--- a/mono-addins-monodir.patch
+++ b/mono-addins-monodir.patch
@@ -12,27 +12,26 @@ diff -urN mono-addins-0.5/configure.ac mono-addins-0.5.new//configure.ac
  
  AC_SUBST(GACUTIL)
  AC_SUBST(GACUTIL_FLAGS)
-diff -urN mono-addins-0.5/mautil/Makefile.am mono-addins-0.5.new//mautil/Makefile.am
---- mono-addins-0.5/mautil/Makefile.am	2010-05-21 22:03:41.000000000 +0200
-+++ mono-addins-0.5.new//mautil/Makefile.am	2010-10-23 00:35:30.935991969 +0200
-@@ -36,7 +36,7 @@
- 
+--- mono-addins-mono-addins-1.0/mautil/Makefile.am.orig	2012-10-16 13:30:05.000000000 +0200
++++ mono-addins-mono-addins-1.0/mautil/Makefile.am	2014-01-07 20:39:31.996739063 +0100
+@@ -8,7 +8,7 @@
  include $(top_srcdir)/Makefile.include
+ include $(top_srcdir)/xbuild.include
  
--pkglibdir = $(libdir)/mono/mono-addins
-+pkglibdir = $(prefix)/lib/mono/mono-addins
- pkglib_SCRIPTS = $(ASSEMBLY) $(build_datafiles)
+-programfilesdir = $(libdir)/mono/mono-addins
++programfilesdir = $(prefix)/lib/mono/mono-addins
+ programfiles_DATA = $(ASSEMBLY) $(build_datafiles)
  
  man_MANS = mautil.1
-diff -urN mono-addins-0.5/Mono.Addins.MSBuild/Makefile.am mono-addins-0.5.new//Mono.Addins.MSBuild/Makefile.am
---- mono-addins-0.5/Mono.Addins.MSBuild/Makefile.am	2010-05-25 18:11:20.000000000 +0200
-+++ mono-addins-0.5.new//Mono.Addins.MSBuild/Makefile.am	2010-10-23 00:37:09.653851183 +0200
-@@ -39,7 +39,7 @@
- 	mkdir -p $(dir $(ASSEMBLY))		
- 	$(ASSEMBLY_COMPILER_COMMAND) $(ASSEMBLY_COMPILER_FLAGS) -out:$@ -target:$(COMPILE_TARGET) $(build_sources) $(build_resources_embed) $(build_references_ref)
- 
--xbuilddir = $(libdir)/mono/xbuild
-+xbuilddir = $(prefix)/lib/mono/xbuild
- xbuild_DATA = Mono.Addins.targets
- 
- install-data-local: gac-install
+#diff -urN mono-addins-0.5/Mono.Addins.MSBuild/Makefile.am mono-addins-0.5.new//Mono.Addins.MSBuild/Makefile.am
+#--- mono-addins-0.5/Mono.Addins.MSBuild/Makefile.am	2010-05-25 18:11:20.000000000 +0200
+#+++ mono-addins-0.5.new//Mono.Addins.MSBuild/Makefile.am	2010-10-23 00:37:09.653851183 +0200
+#@@ -39,7 +39,7 @@
+# 	mkdir -p $(dir $(ASSEMBLY))		
+# 	$(ASSEMBLY_COMPILER_COMMAND) $(ASSEMBLY_COMPILER_FLAGS) -out:$@ -target:$(COMPILE_TARGET) $(build_sources) $(build_resources_embed) $(build_references_ref)
+# 
+#-xbuilddir = $(libdir)/mono/xbuild
+#+xbuilddir = $(prefix)/lib/mono/xbuild
+# xbuild_DATA = Mono.Addins.targets
+# 
+# install-data-local: gac-install
diff --git a/mono-addins-pkglibdir.patch b/mono-addins-pkglibdir.patch
deleted file mode 100644
index e9d85cf..0000000
--- a/mono-addins-pkglibdir.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- mono-addins-0.5/Mono.Addins/mono-addins.pc.in.orig	2010-05-21 22:03:41.000000000 +0200
-+++ mono-addins-0.5/Mono.Addins/mono-addins.pc.in	2010-09-26 19:29:02.052559815 +0200
-@@ -1,6 +1,6 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
--pkglibdir=@libdir@/mono/@PACKAGE@
-+pkglibdir=${prefix}/lib/mono/@PACKAGE@
- Libraries=  ${pkglibdir}/@MONO_ADDINS_DEFAULT_LIB@
- 
- Name: Mono.Addins
---- mono-addins-0.5/Mono.Addins.Gui/mono-addins-gui.pc.in.orig	2010-05-21 22:03:41.000000000 +0200
-+++ mono-addins-0.5/Mono.Addins.Gui/mono-addins-gui.pc.in	2010-09-26 19:29:26.640556463 +0200
-@@ -1,6 +1,6 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
--pkglibdir=@libdir@/mono/@PACKAGE@
-+pkglibdir=${prefix}/lib/mono/@PACKAGE@
- Libraries=  ${pkglibdir}/@MONO_ADDINS_GUI_DEFAULT_LIB@
- 
- Name: Mono.Addins.Gui
---- mono-addins-0.5/Mono.Addins.Setup/mono-addins-setup.pc.in.orig	2010-05-21 22:03:41.000000000 +0200
-+++ mono-addins-0.5/Mono.Addins.Setup/mono-addins-setup.pc.in	2010-09-26 19:29:41.544556463 +0200
-@@ -1,6 +1,6 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
--pkglibdir=@libdir@/mono/@PACKAGE@
-+pkglibdir=${prefix}/lib/mono/@PACKAGE@
- Libraries=  ${pkglibdir}/@MONO_ADDINS_SETUP_DEFAULT_LIB@
- 
- Name: Mono.Addins.Setup
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mono-addins.git/commitdiff/0e6837a3afc25e4eb20c8acdd252033b37bd0e62

More information about the pld-cvs-commit mailing list