From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Fri, 2 Mar 2007 00:28:57 +0300 From: Alexey Tourbin To: devel@lists.altlinux.org Message-ID: <20070301212857.GN32320@localhost.localdomain> Mail-Followup-To: devel@lists.altlinux.org References: <20070211220836.97D3E42C08D7@ssh.git.local.altlinux.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="Ie5iOtK4e9kgqh2F" Content-Disposition: inline In-Reply-To: <20070211220836.97D3E42C08D7@ssh.git.local.altlinux.org> Subject: Re: [devel] [git update] packages/rpm: heads/master X-BeenThere: devel@lists.altlinux.org X-Mailman-Version: 2.1.9rc1 Precedence: list Reply-To: ALT Devel discussion list List-Id: ALT Devel discussion list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Mar 2007 21:24:35 -0000 Archived-At: List-Archive: List-Post: --Ie5iOtK4e9kgqh2F Content-Type: text/plain; charset=koi8-r Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Feb 12, 2007 at 01:08:36AM +0300, Dmitry V. Levin wrote: > Update of /people/ldv/packages/rpm.git >=20 > Changes statistics since `4.0.4-alt72-g6a53902' follows: > autodeps/linux.prov.in | 2 ++ > autodeps/linux.req.in | 29 +++++++++++++++++++++++++++++ > platform.in | 4 ++-- > 3 files changed, 33 insertions(+), 2 deletions(-) >=20 > Changelog since `4.0.4-alt72-g6a53902' follows: > commit 7227d450caf39c13da3596bd17b60dc4d20c575a > Merge: 6a53902827037e9f38fbbdbc2509996fc12b52b5 280e69d9a539cf066a3a072e9= c8fda6e97a420f1 > Author: Dmitry V. Levin > Date: Sun Feb 11 22:02:54 2007 +0000 >=20 > Merge branch 'master' of git.alt:/people/damir/packages/rpm >=20 > commit 280e69d9a539cf066a3a072e9c8fda6e97a420f1 > Author: Damir Shayhutdinov > Date: Sat Feb 10 19:16:04 2007 +0300 >=20 > Added hooks for Java autoreq facility. > =20 > Signed-off-by: Damir Shayhutdinov >=20 > Full diff since `4.0.4-alt72-g6a53902' follows: > diff --git a/autodeps/linux.prov.in b/autodeps/linux.prov.in > index cd59580..fc9fb8f 100755 > --- a/autodeps/linux.prov.in > +++ b/autodeps/linux.prov.in > @@ -52,6 +52,8 @@ ParseMethod() > FIND_SHELL=3D > FIND_TCL=3D > ;; > + java|nojava) > + ;; > lib) > FIND_LIBS=3D1 > ;; > diff --git a/autodeps/linux.req.in b/autodeps/linux.req.in > index f1980e2..80dfa45 100755 > --- a/autodeps/linux.req.in > +++ b/autodeps/linux.req.in > @@ -36,6 +36,7 @@ exit_handler() > trap exit_handler EXIT > =20 > FIND_FILES=3D > +FIND_JAVA=3D > FIND_LIBPERL=3D > FIND_LIBS=3D > FIND_MONO=3D > @@ -54,6 +55,7 @@ ParseMethod() > case "${t/%,}" in > no|none|off|false) > FIND_FILES=3D > + FIND_JAVA=3D > FIND_LIBPERL=3D > FIND_LIBS=3D > FIND_MONO=3D > @@ -64,6 +66,12 @@ ParseMethod() > FIND_SHELL=3D > FIND_TCL=3D > ;; > + java) > + FIND_JAVA=3D1 > + ;; > + nojava) > + FIND_JAVA=3D > + ;; > lib|library) > FIND_LIBS=3D1 > ;; > @@ -131,6 +139,7 @@ ParseMethod() > FIND_LIBPERL=3D1 > FIND_LIBS=3D1 > FIND_MONO=3D1 > + FIND_JAVA=3D1 > FIND_PAM=3D1 > FIND_PERL=3D1 > FIND_PKGCONFIG=3D1 > @@ -159,6 +168,7 @@ if [ -n "$FIND_PAM" -o \ > fi > =20 > if [ -z "$FIND_FILES" -a \ > + -z "$FIND_JAVA" -a \ > -z "$FIND_LIBPERL" -a \ > -z "$FIND_LIBS" -a \ > -z "$FIND_MONO" -a \ > @@ -187,11 +197,23 @@ case "$LD_PRELOAD" in > esac > =20 > FOUND_REQS=3D > +LIST_JAVA=3D > LIST_MONO=3D > LIST_PERL=3D > LIST_PYTHON=3D > LIST_TCL=3D > =20 > +FindJavaReqs() > +{ > + [ -n "$FIND_JAVA" -a -n "$LIST_JAVA" -a -x "@RPMCONFIGDIR@/java.req" ] = || return 0 > + > + local r > + r=3D"$(printf %s\\n "$LIST_JAVA" | > + @RPMCONFIGDIR@/java.req "$RPM_BUILD_DIR" "$RPM_BUILD_ROOT" "$RPM_L= IBDIR")" || return 1 =E1 =CB=C1=CB=CF=CA =D3=CD=D9=D3=CC =D0=C5=D2=C5=C4=C1=D7=C1=D4=D8 =C4=CF= =D0=CF=CC=CE=C9=D4=C5=CC=D8=CE=D9=C5 =D0=C1=D2=C1=CD=C5=D4=D2=D9 =D3=CB=D2= =C9=D0=D4=D5, =C5=D3=CC=C9, =D7=CF-=D0=C5=D2=D7=D9=C8, =DC=D4=C9 =D0=C1=D2=C1=CD=C5=D4=D2=D9 =D0=CF-=D0= =D2=C5=D6=CE=C5=CD=D5 =C4=CF=D3=D4=D5=D0=CE=D9 =DE=C5=D2=C5=DA environment; =C1 =D7=CF-=D7=D4=CF=D2=D9=C8, PRM_BUILD_DIR =D2=C1=D3=CB=D2=D9=D7=C1=C5=D4= =D3=D1 =D3=CF=D7=D3=C5=CD =CE=C5 =D7 =D4=CF, =D7=CF =DE=D4=CF =C8=CF=DE=C5= =D4=D3=D1, =C1 =D7 `rpm --eval %_builddir`, =CB=CF=D4=CF=D2=D9=CA =CF=C4=C9=CE=C1=CB= =CF=D7=D9=CA =C4=CC=D1 =D7=D3=C5=C8 =D0=C1=CB=C5=D4=CF=D7? =F0=CF-=CD=CF=C5=CD=D5, =D0=C1=D2=C1=CD=C5=D4=D2=D9 =CC=D5=DE=DB=C5 =DA=C1= =D2=C5=DA=C5=D2=D7=C9=D2=CF=D7=C1=D4=D8 =C4=CC=D1 =D4=CF=C7=CF, =DE=D4=CF= =C2=D9 =C2=D2=C1=D4=D8 =C6=C1=CA=CC=D9 =C9=DA =CB=CF=CD=C1=CE=C4=CE=CF=CA =D3=D4=D2=CF=CB=C9, =C1 =C5=D3=CC=C9 =CB=CF=CD= =C1=CE=C4=CE=C1=D1 =D3=D4=D2=CF=CB=C1 =D0=D5=D3=D4=C1=D1, =D4=CF=C7=C4=C1 = =DE=C9=D4=C1=D4=D8 =D3=D0=C9=D3=CF=CB =C6=C1=CA=CC=CF=D7 =C9=DA stdin. =EB=D3=D4=C1=D4=C9, =D7=D4=CF=D2=CF=C5 =CF=C2=D3=D4=CF=D1=D4=C5=CC=D8=D3=D4= =D7=CF =C4=CF=D7=CF=CC=D8=CE=CF =D4=D1=C7=CF=D3=D4=CE=CF: =DE=D4=CF=C2=D9 = =D0=CF=CC=D5=DE=C9=D4=D8 =C9=CE=C6=CF=D2=CD=C1=C3=C9=C0 =C9=DA =D3=C2=CF=D2=CF=DE=CE=CF=C7=CF =CB=C1= =D4=C1=CC=CF=C7=C1 =CE=C1 =D3=D4=C1=C4=C9=C9 find-requires, =D0=D2=C9=C8=CF= =C4=C9=D4=D3=D1 =CB=CF=D0=C9=D2=CF=D7=C1=D4=D8 =C5=C5 =D7 %buildroot =CE=C1 =D3=D4=C1=C4=C9= =C9 %install. =ED=CF=D6=C5=D4 =CB=D4=CF-=D4=CF =D0=D2=C9=D0=CF=CD=C9=CE=C1= =C5=D4 =CC=C5=D7=D9=C5 =C6=C1=CA=CC=D9 =D7 %buildroot =D3 =CE=C1=DA=D7=C1=CE=C9=C5= =CD /.perl.req. > + [ -z "$FOUND_REQS" ] && FOUND_REQS=3D"$r" || FOUND_REQS=3D"$FOUND_REQS > +$r" > +} > + > FindMonoReqs() > { > [ -n "$FIND_MONO" -a -n "$LIST_MONO" -a -x "@RPMCONFIGDIR@/mono.req" ] = || return 0 > @@ -425,9 +447,16 @@ $f" > elif [ -z "${t##*MS Windows PE*}" ]; then > [ -z "$LIST_MONO" ] && LIST_MONO=3D"$f" || LIST_MONO=3D"$LIST_MONO > $f" > + elif [ -z "${t##*Zip archive data*}" -a -z "${f##*.jar}" ] || > + [ -z "${t##*compiled Java class data*}" ]; then > + [ -z "$LIST_JAVA" ] && LIST_JAVA=3D"$f" || LIST_JAVA=3D"$LIST_JAVA > +$f" > fi > done > =20 > +# Find requires in listed Java files, if any > +FindJavaReqs > + > # Find requires in listed .Net files, if any > FindMonoReqs > =20 > diff --git a/platform.in b/platform.in > index 19c778e..3bce5dd 100644 > --- a/platform.in > +++ b/platform.in > @@ -454,8 +454,8 @@ > @alt@%_tcl_req_skip "" > @alt@%_fixup_method binconfig pkgconfig libtool > @alt@%_strip_method %{?_enable_debug:none}%{!?_enable_debug:executable s= hared} > -@alt@%_findreq_default_method files lib mono pam perl pkgconfig python s= hell tcl > -@alt@%_findprov_default_method lib mono pam perl pkgconfig python shell = tcl > +@alt@%_findreq_default_method files java lib mono pam perl pkgconfig pyt= hon shell tcl > +@alt@%_findprov_default_method java lib mono pam perl pkgconfig python s= hell tcl > @alt@ > @alt@%_cleanup_topdir %nil > @alt@%_compress_topdir %_usr --Ie5iOtK4e9kgqh2F Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) iD8DBQFF50WZfBKgtDjnu0YRAvMoAKDlbN1fpGZ/940bZrcNB7se8UKg3ACgi2Jd AkNKdCShdk4bryy4oStC4LI= =5iK4 -----END PGP SIGNATURE----- --Ie5iOtK4e9kgqh2F--