From d0c2035b6845e3a1579303f378d929dbb47eb5ac Mon Sep 17 00:00:00 2001 From: Rosa Date: Wed, 1 Feb 2012 17:15:17 +0400 Subject: [PATCH 1/2] Automatic import for version 2.10.8.1 --- .abf.yml | 2 +- mono.spec | 221 +++++++++++++++++++++++++++++++++++++++++++----------- 2 files changed, 178 insertions(+), 45 deletions(-) diff --git a/.abf.yml b/.abf.yml index bb194ce..843991a 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,2 @@ sources: - "mono-2.10.2.tar.bz2": 7b673255c6b17c5a41c15059e5f068d6a970d2ea + "mono-2.10.8.1.tar.gz": d67f2e276b27e28f861ecc6e3e07fee538d4c4fe diff --git a/mono.spec b/mono.spec index aa01d91..0f0cfab 100644 --- a/mono.spec +++ b/mono.spec @@ -1,6 +1,6 @@ %define name mono -%define version 2.10.2 -%define release %mkrel 4 +%define version 2.10.8.1 +%define release %mkrel 1 %define major 0 %define major1 1 @@ -27,7 +27,7 @@ Version: %version Release: %release License: GPLv2 and LGPLv2+ and MIT Group: Development/Other -Source0: http://www.go-mono.com/sources/%name/%name-%version.tar.bz2 +Source0: http://download.mono-project.com/sources/%name/%name-%version.tar.gz # This key was generated by Götz Waschk on Oct 14, 2010 # by running the following command: # sn -k mono.snk @@ -194,6 +194,7 @@ Requires: %libnamellvm = %version-%release %endif Requires: mono = %version Requires: mono-data = %version +Requires: mono-build = %version Requires: mono-extras = %version Requires: mono-web = %version Requires: mono-locale-extras = %version @@ -592,6 +593,64 @@ technologies that have been submitted to the ECMA for standardization. Mono implementation of WCF, Windows Communication Foundation +%package build +Summary: Mono APIs needed for software development +Group: Development/Other +Requires: %name-build-2.0 = %version +Requires: %name-build-3.5 = %version +Requires: %name-build-4.0 = %version + +%description build +The Mono Project is an open development initiative that is working to +develop an open source, Unix version of the .NET development platform. +Its objective is to enable Unix developers to build and deploy +cross-platform .NET applications. The project will implement various +technologies that have been submitted to the ECMA for standardization. + +Mono APIs needed for software development + +%package build-2.0 +Summary: Mono APIs needed for software development, API 2.0 +Group: Development/Other +Conflicts: %libnamedev < 2.10.5-2 + +%description build-2.0 +The Mono Project is an open development initiative that is working to +develop an open source, Unix version of the .NET development platform. +Its objective is to enable Unix developers to build and deploy +cross-platform .NET applications. The project will implement various +technologies that have been submitted to the ECMA for standardization. + +Mono APIs needed for software development, API 2.0 + +%package build-3.5 +Summary: Mono APIs needed for software development, API 3.5 +Group: Development/Other +Conflicts: %libnamedev < 2.10.5-2 + +%description build-3.5 +The Mono Project is an open development initiative that is working to +develop an open source, Unix version of the .NET development platform. +Its objective is to enable Unix developers to build and deploy +cross-platform .NET applications. The project will implement various +technologies that have been submitted to the ECMA for standardization. + +Mono APIs needed for software development, API 3.5 + +%package build-4.0 +Summary: Mono APIs needed for software development, API 4.0 +Group: Development/Other +Conflicts: %libnamedev < 2.10.5-2 + +%description build-4.0 +The Mono Project is an open development initiative that is working to +develop an open source, Unix version of the .NET development platform. +Its objective is to enable Unix developers to build and deploy +cross-platform .NET applications. The project will implement various +technologies that have been submitted to the ECMA for standardization. + +Mono APIs needed for software development, API 4.0 + %prep %setup -q %patch0 -p1 -b .dllmap @@ -707,6 +766,8 @@ rm -rf %{buildroot} %monodir/mono-configuration-crypto %dir %monodir/gac/Mono.C5 %monodir/gac/Mono.C5/1.1.0.0* +%monodir/gac/Mono.Cecil/ +%monodir/gac/Mono.Cecil.Mdb/ %files 2.0 %defattr(-, root, root) @@ -856,6 +917,76 @@ rm -rf %{buildroot} %monodir/compat-2.0/ICSharpCode.SharpZipLib.dll %monodir/gac/ICSharpCode.SharpZipLib/2.6.0.0* +%files build +%defattr(-, root, root) + +%files build-2.0 +%defattr(-, root, root) +%monodir/2.0/Microsoft.Build.Tasks.dll +%dir %monodir/gac/Microsoft.Build.Tasks +%monodir/gac/Microsoft.Build.Tasks/2.0.0.0* +%monodir/2.0/Microsoft.Build.Framework.dll +%dir %monodir/gac/Microsoft.Build.Framework/ +%monodir/gac/Microsoft.Build.Framework/2.0.0.0* +%monodir/2.0/Microsoft.Build.Utilities.dll +%dir %monodir/gac/Microsoft.Build.Utilities/ +%monodir/gac/Microsoft.Build.Utilities/2.0.0.0* +%monodir/2.0/Microsoft.Build.Engine.dll +%dir %monodir/gac/Microsoft.Build.Engine/ +%monodir/gac/Microsoft.Build.Engine/2.0.0.0* +%monodir/2.0/Mono.Debugger.Soft.dll +%dir %monodir/gac/Mono.Debugger.Soft/ +%monodir/gac/Mono.Debugger.Soft/2.0.0.0* +%monodir/2.0/PEAPI.dll +%dir %monodir/gac/PEAPI/ +%monodir/gac/PEAPI/2.0.0.0* +%monodir/2.0/MSBuild + +%files build-3.5 +%defattr(-, root, root) +%monodir/3.5/Microsoft.Build.Framework.dll +%dir %monodir/gac/Microsoft.Build.Framework/ +%monodir/gac/Microsoft.Build.Framework/3.5.0.0* +%monodir/3.5/Microsoft.Build.Engine.dll +%dir %monodir/gac/Microsoft.Build.Engine/ +%monodir/gac/Microsoft.Build.Engine/3.5.0.0* +%monodir/3.5/Microsoft.Build.Tasks.v3.5.dll +%monodir/gac/Microsoft.Build.Tasks.v3.5 +%monodir/gac/Microsoft.Build.Utilities.v3.5 +%monodir/3.5/Microsoft.Build.Utilities.v3.5.dll +%monodir/3.5/MSBuild + +%files build-4.0 +%defattr(-, root, root) +%monodir/4.0/Microsoft.Build.dll +%dir %monodir/gac/Microsoft.Build/ +%monodir/gac/Microsoft.Build/4.0.0.0* +%monodir/4.0/Microsoft.Build.xsd +%monodir/4.0/Microsoft.Build.Framework.dll +%dir %monodir/gac/Microsoft.Build.Framework/ +%monodir/gac/Microsoft.Build.Framework/4.0.0.0* +%monodir/4.0/Microsoft.Build.Engine.dll +%dir %monodir/gac/Microsoft.Build.Engine/ +%monodir/gac/Microsoft.Build.Engine/4.0.0.0* +%monodir/gac/Microsoft.Build.Tasks.v4.0 +%monodir/4.0/Microsoft.Build.Tasks.v4.0.dll +%monodir/gac/Microsoft.Build.Utilities.v4.0 +%monodir/4.0/Microsoft.Build.Utilities.v4.0.dll +%monodir/4.0/Microsoft.CSharp.targets +%monodir/4.0/Microsoft.Common.targets +%monodir/4.0/Microsoft.Common.tasks +%monodir/4.0/Microsoft.VisualBasic.targets +%monodir/4.0/PEAPI.dll +%dir %monodir/gac/PEAPI/ +%monodir/gac/PEAPI/4.0.0.0* +%monodir/4.0/Mono.CodeContracts.dll +%dir %monodir/gac/Mono.CodeContracts/ +%monodir/gac/Mono.CodeContracts/4.0.0.0* +%monodir/4.0/Mono.Debugger.Soft.dll +%dir %monodir/gac/Mono.Debugger.Soft/ +%monodir/gac/Mono.Debugger.Soft/4.0.0.0* +%monodir/4.0/MSBuild + %files doc %defattr(-, root, root) %doc AUTHORS COPYING.LIB NEWS README @@ -891,7 +1022,6 @@ rm -rf %{buildroot} %dir %_includedir/mono-2.0/ %_includedir/mono-2.0/* %{_libdir}/*.a -%attr(644,root,root) %{_libdir}/*.la %_libdir/libmono*.so %_libdir/pkgconfig/cecil.pc %_libdir/pkgconfig/dotnet.pc @@ -995,34 +1125,6 @@ rm -rf %{buildroot} %monodir/4.0/secutil.exe* %monodir/4.0/sgen.exe* %monodir/4.0/signcode.exe* -%monodir/4.0/Microsoft.Build.xsd -%monodir/gac/Microsoft.Build.Tasks -%monodir/2.0/Microsoft.Build.Tasks.dll -%monodir/gac/Microsoft.Build.Framework -%monodir/2.0/Microsoft.Build.Framework.dll -%monodir/3.5/Microsoft.Build.Framework.dll -%monodir/4.0/Microsoft.Build.Framework.dll -%monodir/gac/Microsoft.Build.Utilities -%monodir/2.0/Microsoft.Build.Utilities.dll -%monodir/gac/Microsoft.Build.Engine -%monodir/2.0/Microsoft.Build.Engine.dll -%monodir/3.5/Microsoft.Build.Engine.dll -%monodir/4.0/Microsoft.Build.Engine.dll -%monodir/3.5/Microsoft.Build.Tasks.v3.5.dll -%monodir/gac/Microsoft.Build.Tasks.v3.5 -%monodir/gac/Microsoft.Build.Tasks.v4.0 -%monodir/4.0/Microsoft.Build.Tasks.v4.0.dll -%monodir/gac/Microsoft.Build.Utilities.v3.5 -%monodir/3.5/Microsoft.Build.Utilities.v3.5.dll -%monodir/gac/Microsoft.Build.Utilities.v4.0 -%monodir/4.0/Microsoft.Build.Utilities.v4.0.dll -%monodir/4.0/Microsoft.CSharp.targets -%monodir/4.0/Microsoft.Common.targets -%monodir/4.0/Microsoft.Common.tasks -%monodir/4.0/Microsoft.VisualBasic.targets -%monodir/gac/PEAPI -%monodir/2.0/PEAPI.dll -%monodir/4.0/PEAPI.dll %monodir/2.0/Microsoft.Build.xsd %monodir/2.0/Microsoft.Common.tasks %monodir/2.0/Microsoft.Common.targets @@ -1030,16 +1132,6 @@ rm -rf %{buildroot} # %monodir/2.0/Microsoft.VisualBasic.targets # -%monodir/gac/Mono.Cecil/ -%monodir/gac/Mono.Cecil.Mdb/ -%monodir/gac/Mono.CodeContracts -%monodir/4.0/Mono.CodeContracts.dll -%monodir/gac/Mono.Debugger* -%monodir/2.0/Mono.Debugger* -%monodir/4.0/Mono.Debugger* -%monodir/2.0/MSBuild -%monodir/3.5/MSBuild -%monodir/4.0/MSBuild %monodir/2.0/xbuild.rsp %monodir/2.0/al.exe %monodir/2.0/al.exe.mdb @@ -1218,6 +1310,17 @@ rm -rf %{buildroot} %files winforms-4.0 %defattr(-, root, root) +#gw stupid rpm5: +%dir %_prefix/lib +%dir %monodir +%dir %monodir/4.0 +%dir %monodir/gac +%dir %monodir/gac/Accessibility +%dir %monodir/gac/Mono.WebBrowser +%dir %monodir/gac/System.Design +%dir %monodir/gac/System.Drawing.Design +%dir %monodir/gac/System.Windows.Forms +%dir %monodir/gac/System.Windows.Forms.DataVisualization %monodir/4.0/Accessibility.dll %monodir/4.0/Mono.WebBrowser.dll %monodir/4.0/System.Design.dll @@ -1298,6 +1401,10 @@ rm -rf %{buildroot} %_bindir/sqlmetal %_bindir/sqlsharp %_mandir/man1/sqlsharp.1* +%dir %monodir +%dir %monodir/2.0 +%dir %monodir/4.0 +%dir %monodir/gac %monodir/gac/IBM.Data.DB2 %monodir/2.0/IBM.Data.DB2.dll %monodir/4.0/IBM.Data.DB2.dll @@ -1498,7 +1605,33 @@ rm -rf %{buildroot} %changelog -* Fri Apr 29 2011 Funda Wang 2.10.2-4mdv2011.0 +* Wed Dec 21 2011 Götz Waschk 2.10.8.1-1mdv2012.0 ++ Revision: 744164 +- add unpackaged dirs +- update file list +- remove libtool archives +- new version +- move Cecil from devel to main package, it is needed by monodoc + +* Fri Nov 25 2011 Götz Waschk 2.10.6-1 ++ Revision: 733330 +- new version +- add conflicts to ease upgrades + +* Thu Sep 08 2011 Götz Waschk 2.10.5-2 ++ Revision: 698937 +- split out some more assemblies that have more than one version to work around a rpm5 bug + +* Tue Sep 06 2011 Götz Waschk 2.10.5-1 ++ Revision: 698422 +- new version +- new URL + +* Fri Aug 05 2011 Götz Waschk 2.10.3-1 ++ Revision: 693326 +- new version + +* Fri Apr 29 2011 Funda Wang 2.10.2-4 + Revision: 660617 - rebuild @@ -1759,7 +1892,7 @@ rm -rf %{buildroot} + Revision: 147673 - depend on gluezilla - + Olivier Blin + + Olivier Blin - restore BuildRoot + Thierry Vignaud From 5211cfc1a57102be8a7c918cb8c06ca6ce66e2c4 Mon Sep 17 00:00:00 2001 From: Rosa Date: Tue, 7 Aug 2012 13:38:53 +0000 Subject: [PATCH 2/2] Automatic import for version 2.10.8.1-4 --- ...-mono-find-requires_strip-whitespace.patch | 8 ++++++ mono.spec | 28 +++++++++++++++---- 2 files changed, 30 insertions(+), 6 deletions(-) create mode 100644 mono-2.10.8.1-mono-find-requires_strip-whitespace.patch diff --git a/mono-2.10.8.1-mono-find-requires_strip-whitespace.patch b/mono-2.10.8.1-mono-find-requires_strip-whitespace.patch new file mode 100644 index 0000000..a75696c --- /dev/null +++ b/mono-2.10.8.1-mono-find-requires_strip-whitespace.patch @@ -0,0 +1,8 @@ +--- mono-2.10.8.1/scripts/mono-find-requires.in.whitespace~ 2012-02-23 16:59:45.523956522 +0100 ++++ mono-2.10.8.1/scripts/mono-find-requires.in 2012-02-23 16:59:47.168957341 +0100 +@@ -187,4 +187,4 @@ $REQUIRES" | sort | uniq -u) + # Of those, only choose the ones that are in REQUIRES + # + echo "$UNIQ +-$REQUIRES" | sort | uniq -d ++$REQUIRES" | sort | uniq -d | sed -e '/^\s*$/d' diff --git a/mono.spec b/mono.spec index 0f0cfab..5c09d42 100644 --- a/mono.spec +++ b/mono.spec @@ -1,6 +1,6 @@ %define name mono %define version 2.10.8.1 -%define release %mkrel 1 +%define release %mkrel 4 %define major 0 %define major1 1 @@ -37,7 +37,8 @@ Source1: mono.snk Patch0: mono-dllmap.patch # (fc) 1.2.3.1-4mdv disable using /proc/self/exe to detect root prefix, it breaks under unionfs Patch1: mono-2.6-selfexe.patch -Patch4: mono-wapi_glop.patch +Patch4: mono-wapi_glop.patch +Patch5: mono-2.10.8.1-mono-find-requires_strip-whitespace.patch URL: http://www.go-mono.com/ BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: bison @@ -656,11 +657,9 @@ Mono APIs needed for software development, API 4.0 %patch0 -p1 -b .dllmap %patch1 -p1 -b .selfexe %patch4 -p1 -b .glop +%patch5 -p1 -b .dep_whitespace~ %build -#gw else the syslog() call will not build -#https://bugzilla.novell.com/show_bug.cgi?id=590967#c16 -%define Werror_cflags %nil #gw else libmonosgen-2.0.la does not build %define _disable_ld_no_undefined 1 %configure2_5x --with-preview=yes \ @@ -709,6 +708,9 @@ rm -f %buildroot%_mandir/man1/prj2make.1* mkdir -p %{buildroot}%{_sysconfdir}/pki/mono install -p -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/pki/mono/ +#gw not wanted anymore: +rm -f %buildroot%_libdir/lib*.la + %clean rm -rf %{buildroot} @@ -1605,7 +1607,21 @@ rm -rf %{buildroot} %changelog -* Wed Dec 21 2011 Götz Waschk 2.10.8.1-1mdv2012.0 +* Thu Feb 23 2012 Per Øyvind Karlsen 2.10.8.1-4mdv2012.0 ++ Revision: 779414 +- don't disable -Werror cflags no more +- strip empty line output from mono-find-requires (P5) + +* Thu Feb 16 2012 Götz Waschk 2.10.8.1-3 ++ Revision: 775252 +- rebuild without the bootstrap flag + +* Thu Feb 16 2012 Götz Waschk 2.10.8.1-2 ++ Revision: 775140 +- manually remove libtool archives +- bootstrap rebuild for missing mono-data-4.0 package + +* Wed Dec 21 2011 Götz Waschk 2.10.8.1-1 + Revision: 744164 - add unpackaged dirs - update file list