From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Tue, 9 May 2006 19:16:52 +0400 From: "Alexey I. Froloff" To: ALT Devel discussion list Message-ID: <20060509151652.GP12447@hell.immo.ru> References: <445B741D.9050402@altlinux.com> <20060505161344.GA29144@basalt.office.altlinux.org> <445B7D26.40202@altlinux.com> <20060505163620.GB29144@basalt.office.altlinux.org> <20060505212536.GD19201@basalt.office.altlinux.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="DMLl6fZPX8o7hGmc" Content-Disposition: inline In-Reply-To: <20060505212536.GD19201@basalt.office.altlinux.org> User-Agent: Mutt/1.5.11 Subject: Re: [devel] =?koi8-r?b?Z2VhciAtINDSz8LMxc3BINMg0MHS08nOx8/NIFNQRUMt?= =?koi8-r?b?xsHKzMEu?= X-BeenThere: devel@lists.altlinux.org X-Mailman-Version: 2.1.7 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: Tue, 09 May 2006 15:17:19 -0000 Archived-At: List-Archive: List-Post: --DMLl6fZPX8o7hGmc Content-Type: multipart/mixed; boundary="oCBD0SPT9UHZkBMO" Content-Disposition: inline --oCBD0SPT9UHZkBMO Content-Type: text/plain; charset=koi8-r Content-Disposition: inline Content-Transfer-Encoding: quoted-printable * Dmitry V. Levin [060506 01:34]: > =E2=CF=CC=C5=C5 =CC=CF=C7=C9=DE=CE=D9=CD =C9 =D5=CE=C9=D7=C5=D2=D3=C1=CC= =D8=CE=D9=CD =D7=D9=C7=CC=D1=C4=C9=D4 "name=3D..." =D3=CF =DA=CE=C1=DE=C5= =CE=C9=C5=CD =D0=CF > =D5=CD=CF=CC=DE=C1=CE=C9=C0 @name@-@version@ (=CB=C1=CB =C9 =D3=C5=CA=DE= =C1=D3) =C9 =D0=CF=C4=C4=C5=D2=D6=CB=CF=CA 4-=C8 =CB=CC=C0=DE=C5=D7=D9=C8 = =D3=CC=CF=D7: > @dir@ - basename =CB=C1=D4=C1=CC=CF=C7=C1 (=CB=CF=D4=CF=D2=D9=CA =D5=CB= =C1=DA=D9=D7=C1=C5=D4=D3=D1 =D0=C5=D2=D7=D9=CD =C1=D2=C7=D5=CD=C5=CE=D4=CF= =CD =C4=C9=D2=C5=CB=D4=C9=D7=D9); > @name@ - =DA=CE=C1=DE=C5=CE=C9=C5 =D4=DC=C7=C1 Name, =C9=DA=D7=CC=C5=DE= =A3=CE=CE=CF=C5 =C9=DA spec-=C6=C1=CA=CC=C1; > @version@ - =DA=CE=C1=DE=C5=CE=C9=C5 =D4=DC=C7=C1 Version, =C9=DA=D7=CC= =C5=DE=A3=CE=CE=CF=C5 =C9=DA spec-=C6=C1=CA=CC=C1; > @name@ - =DA=CE=C1=DE=C5=CE=C9=C5 =D4=DC=C7=C1 Release, =C9=DA=D7=CC=C5= =DE=A3=CE=CE=CF=C5 =C9=DA spec-=C6=C1=CA=CC=C1. =F1 =D4=D5=D4 =CF=C2=CE=C1=D2=D5=D6=C9=CC, =DE=D4=CF =D7 =DC=D4=CF=CD =D2= =C5=D0=CF=DA=C9=D4=C1=D2=C9=C9 =CD=CF=D6=CE=CF =C8=D2=C1=CE=C9=D4=D8 =CE=C5= =D4=CF=CC=D8=CB=CF =C9=D3=C8=CF=C4=CE=C9=CB=C9 =C9 =D0=C1=D4=DE=C9, =CE=CF =C9 =D7=D3=D0=CF=CD= =CF=C7=C1=D4=C5=CC=D8=CE=D9=C5 =D3=CB=D2=C9=D0=D4=D9 ;-) =E5=D3=D4=D8 =D5 =CD=C5=CE=D1 =D7 vim =D4=C1=CB=CF=CA scripts/getpatches, = =CB=CF=D4=CF=D2=D9=CA =D7=D9=CB=C1=DE=C9=D7=C1=C5=D4 =D0=C1=D4=DE=C9 =D3 vim.org =D7 =CF=D4=C4=C5=CC=D8=CE=D9=CA =CB=C1=D4=C1=CC= =CF=C7 files/official-patches =F1 (=CB=C1=CB =C9 =D7=D3=C5=C7=C4=C1) =C8=CF=DE=D5 =D3=D4=D2=C1=CE=CE=CF= =C7=CF: =2Egear-rules: tar.bz2: files/official-patches name=3Dvim-7.0-@dir@-001 =F1 =C8=CF=DE=D5 =C9=CD=C5=D4=D8 =C1=D2=C8=C9=D7 =D3 =C9=CD=C5=CE=C5=CD %name-%mainver%{?pre:%pre}-official-patches-%patchlevel.tar.bz2, =CE=CF =DE=D4=CF=C2=D9 =D7=CE=D5=D4=D2=C9 =C2=D9=CC =CB=C1=D4=C1=CC=CF=C7 "= official-patches"... =F0=D2=C9=CD=C5=D2=CE=CF =D4=C1=CB: tar.bz2: files/official-patches name=3Dvim-7.0-@dir@-001 basename=3Dofficia= l-patches =F0=C1=D4=DE =CE=C1 gear =D7 =C1=D4=D4=C1=DE=C5. =F1 =CE=C5 =D3=D4=C1=CC c= opy-paste'=C9=D4=D8 =D2=C1=D3=CB=D2=D9=D4=C9=C5 =CD=C1=CB=D2=CF=D3=CF=D7 =C5=DD=A3 =C9 =D7 basename, =C5=D3=D4=D8 =CD=CE=C5= =CE=C9=C5 =DE=D4=CF =DC=D4=CF =D7=CF=CF=C2=DD=C5 =CE=C1=C4=CF =D0=C5=D2=C5=CE=C5=D3=D4=C9 =D7 =C6=D5=CE=CB=C3=C9=C0. --=20 Regards, Sir Raorn. --oCBD0SPT9UHZkBMO Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="gear-tar-basename.patch" Content-Transfer-Encoding: quoted-printable gear | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/gear b/gear index 3613797..555ad62 100755 --- a/gear +++ b/gear @@ -246,6 +246,7 @@ get_tar_name() else tar_name=3D'@dir@-@version@' fi + base_name=3D =20 local opt quoted spec=3D spec_name=3D spec_version=3D spec_release=3D =20 @@ -256,6 +257,8 @@ get_tar_name() ;; name=3D*) tar_name=3D"${opt#name=3D}" ;; + basename=3D*) base_name=3D"${opt#basename=3D}" + ;; *) rules_error "Unrecognized option: $opt" ;; esac @@ -306,7 +309,12 @@ make_tar() dir=3D"$1" shift name=3D"$1" + base_name=3D"$name" shift + if [ $# -gt 0 ]; then + base_name=3D"$1" + shift + fi =20 local id if [ "$dir" =3D . ]; then @@ -325,7 +333,7 @@ make_tar() =20 fi =20 - git-tar-tree "$id" "$name" >"$outdir/$name.tar" + git-tar-tree "$id" "$base_name" >"$outdir/$name.tar" case "$cmd" in tar.gz:) gzip -9 "$outdir/$name.tar" @@ -346,7 +354,7 @@ make_archive() check_path dirname "$dir_name" =20 get_tar_name "$(basename -- "$dir_name")" "$@" - make_tar "$cmd" "$dir_name" "$tar_name" + make_tar "$cmd" "$dir_name" "$tar_name" ${base_name:+"$base_name"} } =20 copy_by_pattern() --oCBD0SPT9UHZkBMO-- --DMLl6fZPX8o7hGmc Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2.2 (GNU/Linux) iD8DBQFEYLJkVqT7+fkT8woRAm3vAKCax6mR9IcS/EUmp7QUkx8q5sSKYwCfT55H VQyWNH6u7ZfsYOr8VgLqDGc= =NMMt -----END PGP SIGNATURE----- --DMLl6fZPX8o7hGmc--