[packages/mono] Add patch to remove trailing spaces from deps produced by mono-find-requires, which appear in rpm pa

megabajt megabajt at pld-linux.org
Sat Sep 29 23:31:12 CEST 2012


commit 1da7c2edd3cdc8ac6eaafe4d7e2dd09aec17dccf
Author: Marcin Banasiak <marcin.banasiak at gmail.com>
Date:   Sat Sep 29 23:26:08 2012 +0200

    Add patch to remove trailing spaces from deps produced by
    mono-find-requires, which appear in rpm package as empty requires.
    
    Release 2

 mono-fix-null-requirement.patch | 8 ++++++++
 mono.spec                       | 4 +++-
 2 files changed, 11 insertions(+), 1 deletion(-)
---
diff --git a/mono.spec b/mono.spec
index a7db902..1db4c01 100644
--- a/mono.spec
+++ b/mono.spec
@@ -19,7 +19,7 @@ Summary:	Common Language Infrastructure implementation
 Summary(pl.UTF-8):	Implementacja Common Language Infrastructure
 Name:		mono
 Version:	2.11.4
-Release:	1
+Release:	2
 License:	LGPL v2 (VM), MIT X11/GPL v2 (C# compilers), MIT X11 (classes, tools), GPL v2 (tools)
 Group:		Development/Languages
 # latest downloads summary at http://download.mono-project.com/sources-stable/
@@ -32,6 +32,7 @@ Patch3:		%{name}-awk.patch
 Patch4:		%{name}-console-no-utf8-bom.patch
 Patch5:		%{name}-pc.patch
 Patch6:		%{name}-ARG_MAX.patch
+Patch7:		%{name}-fix-null-requirement.patch
 URL:		http://www.mono-project.com/
 %if %(test -r /dev/random; echo $?)
 BuildRequires:	ACCESSIBLE_/dev/random
@@ -223,6 +224,7 @@ oraz dotGNU.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 # for jay
 cat >> mcs/build/config-default.make <<'EOF'
diff --git a/mono-fix-null-requirement.patch b/mono-fix-null-requirement.patch
new file mode 100644
index 0000000..963823d
--- /dev/null
+++ b/mono-fix-null-requirement.patch
@@ -0,0 +1,8 @@
+--- mono-2.11.4/scripts/mono-find-requires.in.old	2012-09-29 23:20:34.968693110 +0200
++++ mono-2.11.4/scripts/mono-find-requires.in	2012-09-29 23:20:11.525486763 +0200
+@@ -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 's/[ \t]*$//'
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mono.git/commitdiff/1da7c2edd3cdc8ac6eaafe4d7e2dd09aec17dccf



More information about the pld-cvs-commit mailing list