From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on sa.int.altlinux.org X-Spam-Level: X-Spam-Status: No, score=-1.6 required=5.0 tests=AWL,BAYES_00, DNS_FROM_OPENWHOIS,SPF_PASS autolearn=no version=3.2.5 Date: Tue, 30 Nov 2010 13:09:13 +0200 From: Igor Vlasenko To: ALT Linux Team development discussions Message-ID: <20101130110912.GA29906@dad.imath.kiev.ua> References: <20101130100053.GA2039@ssh.git.altlinux.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="O5XBE6gyVG5Rl6Rj" Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: User-Agent: Mutt/1.5.20 (2009-08-17) Subject: Re: [devel] Fwd: [#34442] FAILED dahdi-tools.git=dahdi-tools/2.3.0-alt3 X-BeenThere: devel@lists.altlinux.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: ALT Linux Team development discussions List-Id: ALT Linux Team development discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Nov 2010 11:09:18 -0000 Archived-At: List-Archive: List-Post: --O5XBE6gyVG5Rl6Rj Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit On Tue, Nov 30, 2010 at 01:12:51PM +0300, Denis Smirnov wrote: > Это после добавления buildrequires perl-podlators, что теперь? ... > make[1]: *** [install] Error 1 в письме лог сборки обрезан, а разбираться дольше, чем чинить. Тем более, раз я мог роботом починить, а вы захотели сами, уже сами бы и чинили, зачем по пустякам теребить? Я переключился на новую задачу, и не хочу голову грузить старой. Без наездов :) Я наоборот, with deep respect, и в надежде, что ничего плохого не подумаете :) В общем, у меня сохранилась моя программа perl_51x_fixes2.pl, которая, собственно, и чинит эти пакеты. Я ее запустил из history, $ girar-nmu-prepare --changelog '- repair after perl 5.12 upgrade using girar-nmu' --hook ~/src/repo/girar-nmu.git/perl_51x_fixes2.pl --srpm /var/ftp/pub/Linux/ALT/Sisyphus/files/SRPMS dahdi-tools проверил, собирается ли, $ girar-nmu-local-build dahdi-tools -- hsh --apt-config=/etc/apt/apt.conf.SS смотрю, собралось, поэтому залил на сборку командой girar-nmu-task-for-each dahdi-tools. Пока писал письмо, уже собралось. Поэтому запускайте girar-fetch-build-commit и смотрите git diff sisyphus, что там робот правил. P.S. perl_51x_fixes2.pl прикладываю к письму, она чинит и те 20 пакетов, хотя ее усилий для них не достаточно. может быть, кому-то пригодится, чтобы допилить полуфабрикат. -- Dr. Igor Vlasenko -------------------- Topology Department Institute of Math Kiev, Ukraine --O5XBE6gyVG5Rl6Rj Content-Type: application/x-perl Content-Disposition: attachment; filename="perl_51x_fixes2.pl" Content-Transfer-Encoding: quoted-printable #!/usr/bin/perl -w=0Apush @SPECHOOKS, =0Asub {=0A my ($spec) =3D @_;=0A = $spec->{WARN_NOTAPPLIED}--;=0A my $mainsec=3D$spec->get_section('pack= age','');=0A my $man1found=3D0;=0A my $podlators=3D0;=0A my $name= =3D$mainsec->get_tag('Name');=0A #print STDERR "hooking $name...\n";=0A = foreach my $section ($spec->get_sections()) {=0A if ($section->get_type(= ) eq 'files') {=0A #print STDERR "trysec ",$section->get_type(),"\n";= =0A $section->exclude(qr'\%perl_vendor_man3dir');=0A if ($name=3D~/= ^perl-/ or $name=3D~/^RRbibla/) {=0A $section->exclude(qr'\%_man3dir');=0A= }=0A $man1found||=3D$section->match(qr'\%perl_vendor_man1dir');=0A= #if ($name=3D~/^perl-/ or $name=3D~/^biblatex/) {=0A #print STDERR "l= ooking for \%_man1dir ...\n";=0A $man1found||=3D$section->match(qr'\%_man1= dir') ;=0A #}=0A # is %perl_vendor_man1dir killed too?=0A $sect= ion->subst(qr'\%perl_vendor_man1dir','%_man1dir');=0A }=0A }=0A my $i= nstallsec=3D$spec->get_section('install');=0A my $buildsec=3D$spec->get_= section('build');=0A unless ($installsec or $buildsec) {=0A die "Oops! n= o \%install section :(";=0A return;=0A }=0A #print STDERR "hook: man1= =3D$man1found\n";=0A if ($man1found or $name eq 'po4a') {=0A if ($builds= ec->match(qr'\%perl_vendor_build')) {=0A my ($makefilepl, $buildpl);=0A= if ($spec->{SOURCEDIR}) {=0A my $source0=3D$spec->{SOURCEDIR}.'/'.bas= ename($spec->{SOURCES}->[0]);=0A $makefilepl=3D`tar tvf $source0 | grep Ma= kefile.PL`;=0A $buildpl=3D`tar tvf $source0 | grep Build.PL`;=0A } els= e {=0A $makefilepl =3D -f 'Makefile.PL';=0A $buildpl=3D-f 'Build.PL';=0A = }=0A if ($buildpl or $name eq 'zim') {=0A print STDERR "Build.PL\n= ";=0A $buildsec->subst(qr'^\s*\%perl_vendor_build','%perl_vendor_build --i= nstall_path bindoc=3D%_man1dir');=0A } elsif ($makefilepl) {=0A $build= sec->subst(qr'^\s*\%perl_vendor_build','%perl_vendor_build INSTALLMAN1DIR= =3D%_man1dir');=0A } else {=0A $buildsec->subst(qr'^\s*\%perl_vendor_b= uild','%perl_vendor_build INSTALLMAN1DIR=3D%_man1dir');=0A }=0A=0A = $spec->get_section('package','')->push_body('=0A# automatically added durin= g perl 5.8 -> 5.12 upgrade.=0A# perl-podlators is required for pod2man conv= ersion.=0ABuildRequires: perl-podlators=0A');=0A $podlators=3D1;=0A }= =0A }=0A $installsec->exclude(qr'\%perl_vendor_man3dir');=0A=0A=0Amy = @re9=3Dqw/perl-Term-ProgressBar dayplanner parrot perl-Term-ProgressBar vpn= c=0Aperl-Perl-Critic=0Aperl-XML-Entities=0A/;my %re9=3Dmap {$_=3D>1} @re9;= =0Amy @re5=3Dqw/=0Avirt-manager=0Acdlabelgen=0Aaugeas backup-manager cdck c= vs2cl dahdi-tools dhcpdump ffprobe fix-mime-charset fsbackup fuse-chunkfs= =0Agtk-vnc ibutils imapsync kBuild libmemcached libvirt maatkit mingw32-bin= utils mpdtoys obconf openbox pam_krb5=0Apostgrey sks spampd stellarium tete= x-latex-feynmf udpcast upx virt-viewer virt-what vzdump xCAT-client xvattr= =0A/;my %re5=3Dmap {$_=3D>1} @re5;=0Amy @re4=3Dqw/=0Aclusterssh=0Actanify= =0Alrzip=0Amrtg=0Atexlive-bin=0Atexlive-extra=0A/;my %re4=3Dmap {$_=3D>1} @= re4;=0Amy @re2=3Dqw/=0Amysqlsla=0Aperl-Net-SNMP=0A/;my %re2=3Dmap {$_=3D>1}= @re2;=0Amy @re8=3Dqw/=0A/;my %re8=3Dmap {$_=3D>1} @re8;=0Amy @re0=3Dqw/=0A= perl-Term-ProgressBar=0Aperl-Lingua-Preferred=0Aperl-Unicode-UTF8simple=0A/= ;my %re0=3Dmap {$_=3D>1} @re0;=0A# Class-ISA=0Amy @re7=3Dqw/=0Aperl-Test-Cl= ass=0Aperl-Class-InsideOut=0Aperl-CGI-Application=0Aperl-Email-Abstract=0A/= ;my %re7=3Dmap {$_=3D>1} @re7;=0A# Tie-RefHash=0Amy @re1=3Dqw/=0Aperl-Catal= yst-Plugin-Authentication=0Aperl-Class-MakeMethods=0Aperl-Data-Visitor=0Ape= rl-Tie-ToObject=0Aperl-XML-Entities=0A/;my %re1=3Dmap {$_=3D>1} @re1;=0A=0A= # noarch=0A# (not)virt-manager=0Amy @re3=3Dqw/=0Amysqlsla=0Amemcache-top=0A= perl-Jcode=0Aperl-Config-YAML=0Aperl-Mail-POP3Client=0Aperl-Parse-Yapp=0Ape= rl-Pod-Coverage=0Aperl-Set-IntSpan=0A/;my %re3=3Dmap {$_=3D>1} @re3;=0A=0A= =0A #$mainsec->push_body('BuildRequires: perl-B'."\n") if $name eq 'perl= -Test-Strict';=0A $mainsec->push_body('BuildRequires: perl-unicore'."\n"= ) if $name =3D~ '^perl-Crypt-';=0A $mainsec->push_body('BuildRequires: p= erl-pod'."\n") if $name eq 'perl-Boulder';=0A $mainsec->push_body('Build= Requires: perl-Readonly-XS'."\n") if $name eq 'perl-Text-RecordParser';=0A = $mainsec->push_body('BuildRequires: perl-Module-Pluggable'."\n") if $nam= e eq 'perl-Email-Folder' or $name eq 'perl-File-ChangeNotify' or $name eq '= perl-Perl-Critic' or $name eq 'perl-XML-Feed';=0A $mainsec->push_body('E= poch: 1'."\n") if $name eq 'perl-GD-Graph';=0A $mainsec->push_body('Buil= dRequires: perl-Mouse'."\n") if $name eq 'perl-Mouse';=0A $mainsec->push= _body('BuildRequires: perl-Math-Complex'."\n") if $name eq 'perl-Graph';=0A= $mainsec->push_body('BuildRequires: perl-Tie-RefHash'."\n") if $re1{$na= me};=0A $mainsec->push_body('BuildArch: noarch'."\n") if $re3{$name};=0A= $mainsec->push_body('BuildRequires: perl-Term-ANSIColor'."\n") if $name= eq 'memcache-top';=0A $mainsec->push_body('BuildRequires: perl-Pod-Pars= er'."\n") if $re4{$name};=0A $mainsec->push_body('BuildRequires: perl-po= dlators'."\n") if $re5{$name} and not $podlators;=0A $mainsec->push_body= ('BuildRequires: perl-Class-ISA'."\n") if $re7{$name};=0A $mainsec->push= _body('BuildRequires: perl-IPC-SysV'."\n") if $re8{$name};=0A $mainsec->= push_body('BuildRequires: perl-autodie'."\n") if $re9{$name};=0A # re 2= =0A if ($re2{$name}) {=0A foreach my $section ($spec->get_sections()) {= =0A if ($section->get_type() eq 'files') {=0A $section->exclude(qr'\%_= man3dir');=0A }=0A }=0A }=0A # re 1 is VENDOR man3 - done=0A=0A = if ($re0{$name}) {=0A foreach my $section ($spec->get_sections()) {=0A = if ($section->get_type() eq 'files') {=0A $section->exclude(qr'\%_man1di= r');=0A $section->exclude(qr'\%_mandir/\*/\*');=0A $section->exclude(qr'\= %doc \%_mandir/man');=0A }=0A }=0A }=0A=0A #print STDERR "hook pa= ssed!!!!!!!!!!!!!!!!!!!!!!!!!\n";=0A};=0A --O5XBE6gyVG5Rl6Rj--