mirror of
https://abf.rosa.ru/djam/mono.git
synced 2025-02-23 22:02:51 +00:00
Automatic import for version 2.10.8.1-4
This commit is contained in:
parent
d0c2035b68
commit
5211cfc1a5
2 changed files with 30 additions and 6 deletions
8
mono-2.10.8.1-mono-find-requires_strip-whitespace.patch
Normal file
8
mono-2.10.8.1-mono-find-requires_strip-whitespace.patch
Normal file
|
@ -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'
|
28
mono.spec
28
mono.spec
|
@ -1,6 +1,6 @@
|
||||||
%define name mono
|
%define name mono
|
||||||
%define version 2.10.8.1
|
%define version 2.10.8.1
|
||||||
%define release %mkrel 1
|
%define release %mkrel 4
|
||||||
|
|
||||||
%define major 0
|
%define major 0
|
||||||
%define major1 1
|
%define major1 1
|
||||||
|
@ -37,7 +37,8 @@ Source1: mono.snk
|
||||||
Patch0: mono-dllmap.patch
|
Patch0: mono-dllmap.patch
|
||||||
# (fc) 1.2.3.1-4mdv disable using /proc/self/exe to detect root prefix, it breaks under unionfs
|
# (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
|
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/
|
URL: http://www.go-mono.com/
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
||||||
BuildRequires: bison
|
BuildRequires: bison
|
||||||
|
@ -656,11 +657,9 @@ Mono APIs needed for software development, API 4.0
|
||||||
%patch0 -p1 -b .dllmap
|
%patch0 -p1 -b .dllmap
|
||||||
%patch1 -p1 -b .selfexe
|
%patch1 -p1 -b .selfexe
|
||||||
%patch4 -p1 -b .glop
|
%patch4 -p1 -b .glop
|
||||||
|
%patch5 -p1 -b .dep_whitespace~
|
||||||
|
|
||||||
%build
|
%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
|
#gw else libmonosgen-2.0.la does not build
|
||||||
%define _disable_ld_no_undefined 1
|
%define _disable_ld_no_undefined 1
|
||||||
%configure2_5x --with-preview=yes \
|
%configure2_5x --with-preview=yes \
|
||||||
|
@ -709,6 +708,9 @@ rm -f %buildroot%_mandir/man1/prj2make.1*
|
||||||
mkdir -p %{buildroot}%{_sysconfdir}/pki/mono
|
mkdir -p %{buildroot}%{_sysconfdir}/pki/mono
|
||||||
install -p -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/pki/mono/
|
install -p -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/pki/mono/
|
||||||
|
|
||||||
|
#gw not wanted anymore:
|
||||||
|
rm -f %buildroot%_libdir/lib*.la
|
||||||
|
|
||||||
%clean
|
%clean
|
||||||
rm -rf %{buildroot}
|
rm -rf %{buildroot}
|
||||||
|
|
||||||
|
@ -1605,7 +1607,21 @@ rm -rf %{buildroot}
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Wed Dec 21 2011 Götz Waschk <waschk@mandriva.org> 2.10.8.1-1mdv2012.0
|
* Thu Feb 23 2012 Per Øyvind Karlsen <peroyvind@mandriva.org> 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 <waschk@mandriva.org> 2.10.8.1-3
|
||||||
|
+ Revision: 775252
|
||||||
|
- rebuild without the bootstrap flag
|
||||||
|
|
||||||
|
* Thu Feb 16 2012 Götz Waschk <waschk@mandriva.org> 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 <waschk@mandriva.org> 2.10.8.1-1
|
||||||
+ Revision: 744164
|
+ Revision: 744164
|
||||||
- add unpackaged dirs
|
- add unpackaged dirs
|
||||||
- update file list
|
- update file list
|
||||||
|
|
Loading…
Add table
Reference in a new issue