File project.diff of Package monodevelop

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package monodevelop (Revision 65ce21006f245a2eaf58ab2d40c07f52)

Currently displaying revision 65ce21006f245a2eaf58ab2d40c07f52 , Show latest

--- downgrade_to_mvc3.patch.orig
+++ downgrade_to_mvc3.patch
@@ -1,7 +1,44 @@
-Index: xamarin-pkg-monodevelop/src/addins/AspNet/Properties/MonoDevelop.AspNet.addin.xml
-===================================================================
---- xamarin-pkg-monodevelop.orig/src/addins/AspNet/Properties/MonoDevelop.AspNet.addin.xml	2015-04-28 10:16:13.348260401 +0100
-+++ xamarin-pkg-monodevelop/src/addins/AspNet/Properties/MonoDevelop.AspNet.addin.xml	2015-04-28 10:16:13.344260401 +0100
+diff -uprN monodevelop-monodevelop-5.10.0.811.orig/src/addins/AspNet/MonoDevelop.AspNet.csproj monodevelop-monodevelop-5.10.0.811/src/addins/AspNet/MonoDevelop.AspNet.csproj
+--- monodevelop-monodevelop-5.10.0.811.orig/src/addins/AspNet/MonoDevelop.AspNet.csproj	2015-09-30 17:28:25.000000000 +0300
++++ monodevelop-monodevelop-5.10.0.811/src/addins/AspNet/MonoDevelop.AspNet.csproj	2015-10-19 12:05:44.857850290 +0300
+@@ -458,34 +458,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 -uprN monodevelop-monodevelop-5.10.0.811.orig/src/addins/AspNet/Properties/MonoDevelop.AspNet.addin.xml monodevelop-monodevelop-5.10.0.811/src/addins/AspNet/Properties/MonoDevelop.AspNet.addin.xml
+--- monodevelop-monodevelop-5.10.0.811.orig/src/addins/AspNet/Properties/MonoDevelop.AspNet.addin.xml	2015-09-30 17:28:25.000000000 +0300
++++ monodevelop-monodevelop-5.10.0.811/src/addins/AspNet/Properties/MonoDevelop.AspNet.addin.xml	2015-10-19 12:05:33.621938632 +0300
 @@ -1,13 +1,13 @@
  <ExtensionModel>
  	
@@ -45,42 +82,3 @@ Index: xamarin-pkg-monodevelop/src/addin
  	</Extension>
  
  	<Extension path = "/MonoDevelop/ProjectModel/SerializableClasses">
-Index: xamarin-pkg-monodevelop/src/addins/AspNet/MonoDevelop.AspNet.csproj
-===================================================================
---- xamarin-pkg-monodevelop.orig/src/addins/AspNet/MonoDevelop.AspNet.csproj	2015-04-28 10:06:54.100238221 +0100
-+++ xamarin-pkg-monodevelop/src/addins/AspNet/MonoDevelop.AspNet.csproj	2015-04-28 10:16:51.272261905 +0100
-@@ -452,34 +452,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>
--- monodevelop.changes.orig
+++ monodevelop.changes
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Mon Dec 7 21:00:00 UTC 2015 - fwdsbs.to.11df@xoxy.net
+
+- Update to 5.10.0.871
+  * Dropped nuget-2.8.7-support.patch
+  * Added fake nuget for use in build process - no external nuget dependencies will be deployed
+
+-------------------------------------------------------------------
 Tue Oct 27 00:00:00 UTC 2015 - fwdsbs.to.11df@xoxy.net
 
 - Update to 5.9.6.23
--- monodevelop.spec.orig
+++ monodevelop.spec
@@ -23,6 +23,7 @@ BuildRequires:  pkgconfig(glib-sharp-2.0
 BuildRequires:  pkgconfig(gnome-sharp-2.0)
 BuildRequires:  pkgconfig(gtk-sharp-2.0)
 BuildRequires:  pkgconfig(libgnomeui-2.0)
+BuildRequires:  pkgconfig(libssh2)
 %if 0%{?suse_version} > 1100
 BuildRequires:  pkgconfig(gconf-sharp-2.0)
 BuildRequires:  pkgconfig(gnome-vfs-sharp-2.0)
@@ -30,6 +31,7 @@ BuildRequires:  pkgconfig(gtksourceview-
 %endif
 BuildRequires:  autoconf
 BuildRequires:  automake
+BuildRequires:  cmake
 BuildRequires:  dos2unix
 BuildRequires:  fdupes
 BuildRequires:  git
@@ -38,6 +40,7 @@ BuildRequires:  intltool
 BuildRequires:  libtool
 BuildRequires:  shared-mime-info
 BuildRequires:  update-desktop-files
+BuildRequires:  mono(Newtonsoft.Json) >= 7.0.0
 BuildRequires:  pkgconfig(mono)
 # mono-find-requires searches for libmono-2.0.so.1:
 BuildRequires:  pkgconfig(mono-2)
@@ -50,27 +53,31 @@ BuildRequires:  pkgconfig(wcf)
 # Mono.Cecil.dll requires rsync after it's build
 BuildRequires:  rsync
 Url:            http://www.monodevelop.com/
-Version:        5.9.6
+Version:        5.10.0
 Release:        0
 Summary:        Full-Featured IDE for Mono and Gtk-Sharp
 License:        LGPL-2.1 and MIT
 Group:          Development/Tools/IDE
-Source:         http://download.mono-project.com/sources/%{name}/%{name}-%{version}.23.tar.bz2
+Source:         http://download.mono-project.com/sources/%{name}/%{name}-%{version}.871.tar.bz2
 Source2:        monodevelop-rpmlintrc
+Source3:        FakeNuget.cs
 Patch0:         downgrade_to_mvc3.patch
-Patch1:         nuget-2.8.7-support.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildArch:      noarch
 Requires:       mono-basic
 Requires:       mono-web
 Requires:       nunit
 Requires:       pkgconfig
 Requires:       xsp
+Provides:       mono(libstetic) = 0.0.0.0
+Provides:       mono(libsteticui) = 0.0.0.0
 Recommends:     mono-devel
 Recommends:     mono-tools
 Recommends:     git
-Recommends:     libgnomeui
 Suggests:       monodevelop-database
+#Maybe we should make following 3 requirments mandatory, because of error or silent crash at startup when some of them are missing:
+Recommends:     libgnomeui
+Recommends:     mono(gnome-sharp)
+Recommends:     mono(gconf-sharp)
 
 %define _use_internal_dependency_generator 0
 %define __find_provides env sh -c 'filelist=($(cat)) && { printf "%s\\n" "${filelist[@]}" | /usr/lib/rpm/find-provides && printf "%s\\n" "${filelist[@]}" | /usr/bin/mono-find-provides ; } | sort | uniq'
@@ -97,14 +104,31 @@ This package contains development files
 
 %prep
 # https://bugzilla.xamarin.com/show_bug.cgi?id=33309
-%setup -q -n monodevelop-%{version}
+%setup -q -n monodevelop-5.10
 %patch0 -p 1
-%patch1 -p 1
 
 %build
 %{?env_options}
 
-%configure --libdir=%{_prefix}/lib --disable-update-mimedb
+#deploy with nuget will not work in obs, so compile fake NuGet.exe mono executable that only logs command line options
+mcs %{S:3} -out:NuGet.exe
+mv NuGet.exe external/nuget-binary
+
+#create fake nuget binary, needed at early build stage
+nuget_dir=`mktemp -d`
+echo "#!/bin/sh" > $nuget_dir/nuget
+echo "mono \"$PWD/external/nuget-binary/NuGet.exe\" \"\$@\"" >> $nuget_dir/nuget
+chmod 755 $nuget_dir/nuget
+export PATH="$nuget_dir:$PATH"
+
+#manually build external/libgit2sharp/Lib/CustomBuildTasks library, fixes external/libgit2sharp/LibGit2Sharp build failure
+pushd external/libgit2sharp/Lib/CustomBuildTasks
+xbuild /property:Configuration=Release
+cp bin/Release/*.dll .
+popd
+
+#perform configuration and build
+%configure --enable-tests=no --enable-gnomeplatform=yes --enable-subversion=yes --enable-git=yes --libdir=%{_prefix}/lib --disable-update-mimedb
 make
 
 %install
@@ -122,9 +146,11 @@ ln -s %{_prefix}/lib/mono/nunit/nunit.co
 ln -s %{_prefix}/lib/mono/nunit/nunit.core.interfaces.dll %{buildroot}%{_prefix}/lib/monodevelop/AddIns/NUnit/
 ln -s %{_prefix}/lib/mono/nunit/nunit.framework.dll %{buildroot}%{_prefix}/lib/monodevelop/AddIns/NUnit/
 ln -s %{_prefix}/lib/mono/nunit/nunit.util.dll %{buildroot}%{_prefix}/lib/monodevelop/AddIns/NUnit/
-
 %find_lang %{name}
 
+#show fake nuget logfile
+cat /tmp/fake-nuget.log
+
 %if 0%{?suse_version} > 1220
 %fdupes %{buildroot}%{_prefix}
 %endif

Places

File project.diff of Package monodevelop (Revision 65ce21006f245a2eaf58ab2d40c07f52)

Places