[devel] rpm-build-mono configlist

[Alexey Tourbin <at@altlinux.ru>]

[-- Attachment #1: Type: text/plain, Size: 2670 bytes --]

Господа, вот этот кусок кода я не понял и собираюсь его убить.
По-моему, он просто не работает, а добавлять 2>/dev/null дело не хитрое.

$ rpm -ql mono |fgrep .config |xargs monodis --assemblyref
Error while trying to process /etc/mono/1.0/machine.config
Error while trying to process /etc/mono/2.0/machine.config
Error while trying to process /etc/mono/2.0/web.config
$ 

Тем более в changelog'е это изменение не отражено.
Если кто-то знает, в чем здесь дело, прошу мне сообщить.


commit 6eb70398d8ba1426b8d878e798477449728d2fa1
Author: Ildar Mulyukov <ildar@altlinux>
Date:   Mon Oct 9 05:31:51 2006 +0000

    1.0-alt2
    
    - fixed rpm-build-mono.macros

diff --git a/mono.req b/mono.req
index 71b245f..4814c31 100644
--- a/mono.req
+++ b/mono.req
@@ -14,6 +14,7 @@
 IFS=$'\n'
 filelist=($(grep -Ev '/usr/doc/|/usr/share/doc/'))
 monolist=($(printf "%s\n" "${filelist[@]}" | egrep "\\.(exe|dll)\$"))
+configlist=($(printf "%s\n" "${filelist[@]}" | egrep "\\.config\$"))
 
 # If monodis is in the package being installed, use that one
 # This is to support building mono
@@ -54,6 +55,28 @@ REQUIRES=$(
 			}
 		    ') 2> /dev/null
 	done
+	for i in "${configlist[@]}"; do
+		($monodis --assemblyref $i | awk '
+			BEGIN { START=0; LIBNAME=""; }
+			(START==0) && /^[0-9]+: Version=/ {
+				START=1;
+				sub(/Version=/, "", $2);
+				VERSION=$2
+			}
+
+			(START==1) && /^\tName=/ {
+				sub(/Name=/, "", $1);
+				LIBNAME=$1
+				# Allow rpm deps to be resolved for 1.0 profile version
+				if (VERSION=="1.0.3300.0")
+					OP=">="
+				else
+					OP="="
+				print "mono(" LIBNAME ") " OP " " VERSION
+				START=0
+			}
+		    ') 2> /dev/null
+	done
 )
 
 PROVIDES=$(
diff --git a/rpm-build-mono.macros b/rpm-build-mono.macros
index 86a43c2..7ad9972 100644
--- a/rpm-build-mono.macros
+++ b/rpm-build-mono.macros
@@ -1,2 +1,2 @@
-%_monodir       %_libdir/mono
+%_monodir       %_prefix/lib/mono
 %_monogacdir    %_monodir/gac
diff --git a/rpm-build-mono.spec b/rpm-build-mono.spec
index 7957cfb..91d98ed 100644
--- a/rpm-build-mono.spec
+++ b/rpm-build-mono.spec
@@ -1,6 +1,8 @@
+# TODO mono.req detect *so* deps from *.config
+
 Name: rpm-build-mono
 Version: 1.0
-Release: alt1
+Release: alt2
 
 Summary: RPM helper macros and dependency utils to build Mono packages
 Group: Development/Other
@@ -31,5 +33,8 @@ RPM packages containing Mono bytecode archives etc.
 %_libdir/rpm/*
 
 %changelog
+* Mon Oct 09 2006 Ildar Mulyukov <ildar@altlinux> 1.0-alt2
+- fixed rpm-build-mono.macros
+
 * Thu Oct 05 2006 Ildar Mulyukov <ildar@altlinux> 1.0-alt1
 - Initial release

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]