- updated to 5.10.0.871

- updated desktop patch
- update patch replaced with nunit patch (use nunit2 instead of mono-nunit, which is too old now)
- merged avoidgiterrors,nuget-unbundle,no-nuget-packages
- added aspnet patch (use system AspNet packages from mono)

diff --git a/monodevelop-aspnet.patch b/monodevelop-aspnet.patch
new file mode 100644 (file)
index 0000000..2553fd8
--- /dev/null
+++ b/monodevelop-aspnet.patch
@@ -0,0 +1,72 @@
+--- monodevelop-5.10/src/addins/AspNet/MonoDevelop.AspNet.csproj.orig  2015-11-17 15:29:48.000000000 +0100
++++ monodevelop-5.10/src/addins/AspNet/MonoDevelop.AspNet.csproj       2016-02-02 21:18:04.078237294 +0100
+@@ -116,27 +116,13 @@
+       <Name>MonoDevelop.Xml</Name>
+       <Private>False</Private>
+     </ProjectReference>
+-    <Reference Include="Microsoft.Web.Infrastructure">
+-      <HintPath>..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
+-    </Reference>
+-    <Reference Include="System.Web.Razor">
+-      <HintPath>..\..\..\packages\Microsoft.AspNet.Razor.3.2.2\lib\net45\System.Web.Razor.dll</HintPath>
+-    </Reference>
+-    <Reference Include="System.Web.Helpers">
+-      <HintPath>..\..\..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.Helpers.dll</HintPath>
+-    </Reference>
+-    <Reference Include="System.Web.WebPages">
+-      <HintPath>..\..\..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.dll</HintPath>
+-    </Reference>
+-    <Reference Include="System.Web.WebPages.Deployment">
+-      <HintPath>..\..\..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
+-    </Reference>
+-    <Reference Include="System.Web.WebPages.Razor">
+-      <HintPath>..\..\..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
+-    </Reference>
+-    <Reference Include="System.Web.Mvc">
+-      <HintPath>..\..\..\packages\Microsoft.AspNet.Mvc.5.2.2\lib\net45\System.Web.Mvc.dll</HintPath>
+-    </Reference>
++    <Reference Include="Microsoft.Web.Infrastructure" />
++    <Reference Include="System.Web.Razor" />
++    <Reference Include="System.Web.Helpers" />
++    <Reference Include="System.Web.WebPages" />
++    <Reference Include="System.Web.WebPages.Deployment" />
++    <Reference Include="System.Web.WebPages.Razor" />
++    <Reference Include="System.Web.Mvc" />
+   </ItemGroup>
+   <ItemGroup>
+     <Reference Include="System" />
+@@ -458,34 +444,6 @@
+     <None Include="Templates\Projects\WebApplication.xpt.xml">
+       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+     </None>
+-    <None Include="..\..\..\packages\Microsoft.AspNet.Mvc.5.2.2\lib\net45\System.Web.Mvc.dll">
+-      <Link>System.Web.Mvc.dll</Link>
+-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+-    </None>
+-    <None Include="..\..\..\packages\Microsoft.AspNet.Razor.3.2.2\lib\net45\System.Web.Razor.dll">
+-      <Link>System.Web.Razor.dll</Link>
+-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+-    </None>
+-    <None Include="..\..\..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.Helpers.dll">
+-      <Link>System.Web.Helpers.dll</Link>
+-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+-    </None>
+-    <None Include="..\..\..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.Deployment.dll">
+-      <Link>System.Web.WebPages.Deployment.dll</Link>
+-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+-    </None>
+-    <None Include="..\..\..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.dll">
+-      <Link>System.Web.WebPages.dll</Link>
+-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+-    </None>
+-    <None Include="..\..\..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.Razor.dll">
+-      <Link>System.Web.WebPages.Razor.dll</Link>
+-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+-    </None>
+-    <None Include="..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll">
+-      <Link>Microsoft.Web.Infrastructure.dll</Link>
+-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+-    </None>
+     <None Include="packages.config" />
+   </ItemGroup>
+   <ItemGroup>

diff --git a/monodevelop-avoidgiterrors.patch b/monodevelop-avoidgiterrors.patch
new file mode 100644 (file)
index 0000000..ce671e8
--- /dev/null
+++ b/monodevelop-avoidgiterrors.patch
@@ -0,0 +1,10 @@
+--- a/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj        2015-04-16 08:57:37.476669869 +0200
++++ b/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj        2015-04-16 08:58:09.168668388 +0200
+@@ -572,7 +572,5 @@
+     <Exec Command="$(MonoLauncher)$(MSBuildProjectDirectory)\BuildVariables.gen.exe ." WorkingDirectory="$(MSBuildProjectDirectory)" />
+     <Delete Files="BuildVariables.gen.exe" />
+     <MakeDir Directories="$(OutputPath)" />
+-    <Exec Command="&quot;$(Git)&quot; rev-parse HEAD &gt; $(BuildInfo)" WorkingDirectory="$(MSBuildProjectDirectory)" IgnoreExitCode="True" />
+-    <Exec Command="&quot;$(Git)&quot; rev-parse HEAD &gt; $(VcRevision)" WorkingDirectory="$(MSBuildProjectDirectory)" IgnoreExitCode="True" />
+   </Target>
+ </Project>

diff --git a/monodevelop-desktop.patch b/monodevelop-desktop.patch
index a9f946ca586296c1dc946d7848cb9b0f684cd937..2090d94fae98ee9d0019d9f77f96fb3bcba81342 100644 (file)
--- a/monodevelop-desktop.patch
+++ b/monodevelop-desktop.patch
@@ -1,12 +1,12 @@
-diff -ur monodevelop-0.10/monodevelop.desktop monodevelop-0.10-desktop_patch/monodevelop.desktop
---- monodevelop-0.10/monodevelop.desktop       2006-04-04 21:29:37.000000000 +0200
-+++ monodevelop-0.10-desktop_patch/monodevelop.desktop 2006-04-05 18:13:56.000000000 +0200
-@@ -3,7 +3,9 @@
- Encoding=UTF-8
+--- monodevelop-5.10/monodevelop.desktop.orig  2016-01-19 19:01:00.872841006 +0100
++++ monodevelop-5.10/monodevelop.desktop       2016-01-19 19:56:27.892701384 +0100
+@@ -4,8 +4,10 @@
  Name=MonoDevelop
  GenericName=Integrated Development Environment
+ GenericName[ja]=統合開発環境
 +GenericName[pl]=Zintegrowane Środowisko Programistyczne
  Comment=Develop .NET applications in an Integrated Development Environment
+ Comment[ja]=.NETアプリケーション開発を行うための統合開発環境
 +Comment[pl]=Rozwijaj aplikacje .NET w Zintegrowanym Środowisku Programistycznym
  Exec=monodevelop %F
  TryExec=monodevelop

diff --git a/monodevelop-no-nuget-packages.patch b/monodevelop-no-nuget-packages.patch
new file mode 100644 (file)
index 0000000..51e5904
--- /dev/null
+++ b/monodevelop-no-nuget-packages.patch
@@ -0,0 +1,10 @@
+--- a/Makefile.in      2015-11-26 06:19:40.073232455 +0100
++++ b/Makefile.in      2015-11-26 06:20:03.329231309 +0100
+@@ -1065,7 +1065,7 @@
+ 
+ all: vcrevision
+ 
+-all-local: vcrevision restore-packages sln_build
++all-local: vcrevision sln_build
+ 
+ clean: clean-local

diff --git a/monodevelop-nuget-unbundle.patch b/monodevelop-nuget-unbundle.patch
new file mode 100644 (file)
index 0000000..afc958e
--- /dev/null
+++ b/monodevelop-nuget-unbundle.patch
@@ -0,0 +1,16 @@
+--- b/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.csproj
++++ b/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement.csproj
+@@ -57,7 +57,12 @@
+     <Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+     <Reference Include="Mono.Posix" />
+     <Reference Include="NuGet.Core">
+-      <HintPath>..\..\..\external\nuget-binary\NuGet.Core.dll</HintPath>
++      <Package>nuget-core</Package>
++      <Private>True</Private>
++    </Reference>
++    <Reference Include="Microsoft.Web.XmlTransform">
++      <Package>nuget-core</Package>
++      <Private>True</Private>
+     </Reference>
+     <Reference Include="Mono.Cairo" />
+     <Reference Include="System.Security" />

diff --git a/monodevelop-nunit.patch b/monodevelop-nunit.patch
new file mode 100644 (file)
index 0000000..2dd73fb
--- /dev/null
+++ b/monodevelop-nunit.patch
@@ -0,0 +1,74 @@
+--- monodevelop-5.10/external/nrefactory/ICSharpCode.NRefactory.Tests/ICSharpCode.NRefactory.Tests.csproj.orig 2015-08-25 14:50:24.000000000 +0200
++++ monodevelop-5.10/external/nrefactory/ICSharpCode.NRefactory.Tests/ICSharpCode.NRefactory.Tests.csproj      2016-02-02 15:52:16.409057633 +0100
+@@ -92,7 +92,7 @@
+     <Reference Include="System.Xml" />\r
+     <Reference Include="System.Xml.Linq" />\r
+     <Reference Include="nunit.framework">\r
+-      <HintPath>$(CecilHintPath)</HintPath>\r
++      <HintPath>/usr/lib/mono/nunit2/nunit.framework.dll</HintPath>\r
+     </Reference>\r
+   </ItemGroup>\r
+   <ItemGroup>\r
+--- monodevelop-5.10/src/addins/NUnit/MonoDevelop.NUnit.csproj.orig    2015-11-17 15:29:49.000000000 +0100
++++ monodevelop-5.10/src/addins/NUnit/MonoDevelop.NUnit.csproj 2016-02-02 16:09:26.535681106 +0100
+@@ -64,16 +64,16 @@
+     <Reference Include="System.Xml.Linq" />
+     <Reference Include="System.Core" />
+     <Reference Include="nunit.framework">
+-      <HintPath>..\..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
++      <HintPath>/usr/lib/mono/nunit2/nunit.framework.dll</HintPath>
+     </Reference>
+     <Reference Include="nunit.core">
+-      <HintPath>..\..\..\packages\NUnit.Runners.2.6.4\tools\lib\nunit.core.dll</HintPath>
++      <HintPath>/usr/lib/mono/nunit2/nunit.core.dll</HintPath>
+     </Reference>
+     <Reference Include="nunit.core.interfaces">
+-      <HintPath>..\..\..\packages\NUnit.Runners.2.6.4\tools\lib\nunit.core.interfaces.dll</HintPath>
++      <HintPath>/usr/lib/mono/nunit2/nunit.core.interfaces.dll</HintPath>
+     </Reference>
+     <Reference Include="nunit.util">
+-      <HintPath>..\..\..\packages\NUnit.Runners.2.6.4\tools\lib\nunit.util.dll</HintPath>
++      <HintPath>/usr/lib/mono/nunit2/nunit.util.dll</HintPath>
+     </Reference>
+   </ItemGroup>
+   <ItemGroup>
+--- monodevelop-5.10/src/addins/NUnit/NUnitRunner/NUnitRunner.csproj.orig      2015-11-17 15:29:49.000000000 +0100
++++ monodevelop-5.10/src/addins/NUnit/NUnitRunner/NUnitRunner.csproj   2016-02-02 21:00:40.961614328 +0100
+@@ -38,13 +38,13 @@
+     <Reference Include="System" />
+     <Reference Include="System.Xml" />
+     <Reference Include="nunit.framework">
+-      <HintPath>..\..\..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
++    <HintPath>/usr/lib/mono/nunit2/nunit.framework.dll</HintPath>
+     </Reference>
+     <Reference Include="nunit.core">
+-      <HintPath>..\..\..\..\packages\NUnit.Runners.2.6.4\tools\lib\nunit.core.dll</HintPath>
++    <HintPath>/usr/lib/mono/nunit2/nunit.core.dll</HintPath>
+     </Reference>
+     <Reference Include="nunit.core.interfaces">
+-      <HintPath>..\..\..\..\packages\NUnit.Runners.2.6.4\tools\lib\nunit.core.interfaces.dll</HintPath>
++    <HintPath>/usr/lib/mono/nunit2/nunit.core.interfaces.dll</HintPath>
+     </Reference>
+   </ItemGroup>
+   <ItemGroup>
+--- monodevelop-5.10/tests/UserInterfaceTests/UserInterfaceTests.csproj.orig   2015-11-17 15:29:49.000000000 +0100
++++ monodevelop-5.10/tests/UserInterfaceTests/UserInterfaceTests.csproj        2016-02-02 21:42:04.534843509 +0100
+@@ -53,15 +53,15 @@
+       <Private>False</Private>
+     </Reference>
+     <Reference Include="nunit.core">
+-      <HintPath>..\..\packages\NUnit.Runners.2.6.4\tools\lib\nunit.core.dll</HintPath>
++    <HintPath>/usr/lib/mono/nunit2/nunit.core.dll</HintPath>
+       <Private>False</Private>
+     </Reference>
+     <Reference Include="nunit.framework">
+-      <HintPath>..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
++    <HintPath>/usr/lib/mono/nunit2/nunit.framework.dll</HintPath>
+       <Private>False</Private>
+     </Reference>
+     <Reference Include="nunit.core.interfaces">
+-      <HintPath>..\..\packages\NUnit.Runners.2.6.4\tools\lib\nunit.core.interfaces.dll</HintPath>
++    <HintPath>/usr/lib/mono/nunit2/nunit.core.interfaces.dll</HintPath>
+       <Private>False</Private>
+     </Reference>
+     <Reference Include="atk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />

diff --git a/monodevelop.spec b/monodevelop.spec
index d161b1872b756c3d0e15fcb99cc599217a5fa55b..e5e2260fdf6d7aa3c9218f017b0fb74451f2467e 100644 (file)
--- a/monodevelop.spec
+++ b/monodevelop.spec
@@ -1,3 +1,4 @@
+# TODO: use system libgit2, libgit2sharp, nunit, mono-addins
 #
 # Conditional build:
 %bcond_without subversion      # disable subversion backend
@@ -7,22 +8,28 @@
 Summary:       Mono IDE
 Summary(pl.UTF-8):     IDE dla Mono
 Name:          monodevelop
-%define        mainver 5.0.1
-%define        subver  0
-Version:       %{mainver}.%{subver}
+Version:       5.10.0.871
 Release:       1
 # most of code is MIT-licensed, some parts LGPL v2
 License:       LGPL v2, MIT
 Group:         Development/Tools
-Source0:       http://download.mono-project.com/sources/monodevelop/%{name}-%{mainver}-%{subver}.tar.bz2
-# Source0-md5: 5f68aa384c7aa473fdd36da2f70117b4
+Source0:       http://download.mono-project.com/sources/monodevelop/%{name}-%{version}.tar.bz2
+# Source0-md5: 4722cbbaeb7a518dceea8147e6cb6181
 Patch0:                %{name}-desktop.patch
+Patch1:                %{name}-aspnet.patch
+Patch2:                %{name}-nunit.patch
+Patch3:                %{name}-avoidgiterrors.patch
+Patch4:                %{name}-nuget-unbundle.patch
+Patch5:                %{name}-no-nuget-packages.patch
 URL:           http://monodevelop.com/
 BuildRequires: autoconf >= 2.53
 BuildRequires: automake >= 1:1.10
 # gconf-sharp, gnome-sharp, gnome-vfs-sharp
 BuildRequires: dotnet-gnome-sharp-devel >= 2.16.0
 BuildRequires: dotnet-gtk-sharp2-devel >= 2.12.8
+BuildRequires: dotnet-newtonsoft-json-devel >= 6.0
+BuildRequires: dotnet-nuget-devel
+BuildRequires: dotnet-nunit2 >= 2.6.4
 BuildRequires: gettext-tools
 BuildRequires: mono-csharp >= 3.0.4
 BuildRequires: monodoc >= 1.0
@@ -86,13 +93,21 @@ możliwości, a wśród nich:
   pomagającymi zacząć tworzyć aplikacje konsolowe, Gnome# albo Gtk#.
 
 %prep
-%setup -q -n %{name}-%{mainver}
+%setup -q -n monodevelop-5.10
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %{__sed} -i -e 's,\.\./version\.config,version.config,' configure.in
 # bash is needed because of exec -a; avoid hiding dependency by env
 %{__sed} -i -e '1s,#!/usr/bin/env bash,#!/bin/bash,' mdtool.in monodevelop.in
 
+# fake target
+touch restore-packages
+
 %build
 %{__aclocal}
 %{__autoconf}
@@ -102,6 +117,11 @@ możliwości, a wśród nich:
        --disable-update-desktopdb \
        %{?with_subversion:--enable-subversion}
 
+cd external/libgit2sharp/Lib/CustomBuildTasks
+xbuild CustomBuildTasks.csproj /property:Configuration=Release
+ln -snf bin/Release/CustomBuildTasks.dll .
+cd ../../../..
+
 %{__make} -j1
 
 %install
@@ -140,7 +160,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_desktopdir}/monodevelop.desktop
 %{_pkgconfigdir}/monodevelop-core-addins.pc
 %{_pkgconfigdir}/monodevelop.pc
-%{_iconsdir}/hicolor/*/apps/monodevelop.png
-%{_iconsdir}/hicolor/*/apps/monodevelop.svg
+%{_iconsdir}/hicolor/*x*/apps/monodevelop.png
+%{_iconsdir}/hicolor/scalable/apps/monodevelop.svg
 %{_mandir}/man1/mdtool.1*
 %{_mandir}/man1/monodevelop.1*