PATCH: phpBB.spec, 'rpmbuild --bcond phpBB.spec' pokazuje na dwa sposoby..

[Tomasz Wittner]

On Wed 10. of August 2005 21:11, Tomasz Wittner wrote:
> On Wed 10. of August 2005 20:32, Mikolaj Kucharski wrote:
> [...]
> > Roznica miedzy tymi plikami wyglda tak:
> > 
> >               vvv
> > -%bcond_without php5            # tu jest spacaja
> > +%bcond_without php5            # tu jest tabulator
> >               ^^^
> > 
> > Czy to jest blad rpm'a? Jak jest spacja ./builder nie pokazywal jakie
> > mamy opcje budowania do wyboru, wiec moze to blad ./builder'al, ze nie
> > kuma takiej skladni. Dolaczam patcha na phpBB.spec.
> > 
> Chyba ani błąd rpm'a ani buildera. Do PLD'owego rpm'a jest dołączany skrypt
> rpm-find-spec-bcond, który pokazuje bcondy - pewnie tam siedzi bug:
> rpm-4.4.2/SOURCES]$ ./rpm-find-spec-bcond ~/my/devel/pld/cvs/SPECS/mc.spec
> _with_ext2undel
> _without_perl_vfs
> _without_x
> _with_samba
> _with_utf8
> ma byc tak, czy:
> _with
> _ext2undel
> [...]
> ?
[inter w asus 21:34 ~/my/devel/rpm-4.4.2/SOURCES]$ cvs up rpm-find-spec-bcond
U rpm-find-spec-bcond
[inter w asus 21:34 ~/my/devel/rpm-4.4.2/SOURCES]$ ./rpm-find-spec-bcond ~/my/devel/pld/cvs/SPECS/kernel-mosix.spec
_without_doc
_without_owl
_without_smp
_without_source
_without_up
[inter w asus 21:34 ~/my/devel/rpm-4.4.2/SOURCES]$ ./rpm-find-spec-bcond ~/my/devel/pld/cvs/SPECS/mc.spec
_with
_____________
__ext2undel
_without
perl_vfs
_without
x
_with
samba
_with
utf8
[inter w asus 21:35 ~/my/devel/rpm-4.4.2/SOURCES]$ cat rpm-find-spec-bcond.my > rpm-find-spec-bcond
[inter w asus 21:36 ~/my/devel/rpm-4.4.2/SOURCES]$ ./rpm-find-spec-bcond ~/my/devel/pld/cvs/SPECS/kernel-mosix.spec
_without_doc
_without_owl
_without_smp
_without_source
_without_up
[inter w asus 21:36 ~/my/devel/rpm-4.4.2/SOURCES]$ ./rpm-find-spec-bcond ~/my/devel/pld/cvs/SPECS/mc.spec
_with_ext2undel
_without_perl_vfs
_without_x
_with_samba
_with_utf8
[inter w asus 21:36 ~/my/devel/rpm-4.4.2/SOURCES]$ cvs di rpm-find-spec-bcond
Index: rpm-find-spec-bcond
===================================================================
RCS file: /cvsroot/SOURCES/rpm-find-spec-bcond,v
retrieving revision 1.8
diff -u -r1.8 rpm-find-spec-bcond
--- rpm-find-spec-bcond 25 Jan 2004 21:06:08 -0000      1.8
+++ rpm-find-spec-bcond 10 Aug 2005 19:37:08 -0000
@@ -28,9 +28,9 @@
                        print substr($0, RSTART, RLENGTH)
                }
                /^%bcond_with/ && chlog == 0 {
-                       match($0, /bcond_with(out)?[    ]+[_a-zA-Z0-9]+/);
+                       match($0, /bcond_with(out)?[ \t]+[_a-zA-Z0-9]+/);
                                 bcond = substr($0, RSTART +5 , RLENGTH -5);
-                                gsub(/ /,"_",bcond);
+                                gsub(/[ \t]+/,"_",bcond);
                                 print bcond
                        }' $SPEC | sort -u`

Proponuję powyższą poprawkę (i sobie przystosujcie buildera do tego).

-- 
Tomasz Wittner