Bug 23362

Собираю новую версию http://git.altlinux.org/tasks/23566/task/log
Не правильно определяются CRC для req.

2010-Apr-21 01:14:01 :: task #23566 for sisyphus started:
#1 build 2.5.20100406-alt1 from /people/dubrsl/packages/fpc.git
2010-Apr-21 01:14:30 :: created pkg.tar for fpc.git tag 2.5.20100406-alt1
2010-Apr-21 01:14:31 :: [x86_64] #1 fpc.git 2.5.20100406-alt1: build start
2010-Apr-21 01:14:31 :: [i586] #1 fpc.git 2.5.20100406-alt1: build start
2010-Apr-21 01:28:51 :: [i586] #1 fpc.git 2.5.20100406-alt1: build OK
2010-Apr-21 01:30:15 :: [x86_64] #1 fpc.git 2.5.20100406-alt1: build OK
2010-Apr-21 01:30:31 :: build check OK
2010-Apr-21 01:30:33 :: plan OK
2010-Apr-21 01:30:33 :: version check OK
2010-Apr-21 01:30:49 :: created test repo
	i586: NEW unmet dependencies detected:
fpc-units-base#2.5.20100406-alt1	fpc(adler) = 117-2BE81F91
fpc-units-base#2.5.20100406-alt1	fpc(baseunix) = 117-00000000
fpc-units-base#2.5.20100406-alt1	fpc(classes) = 117-7C742481
fpc-units-base#2.5.20100406-alt1	fpc(contnrs) = 117-606FFE5D
fpc-units-base#2.5.20100406-alt1	fpc(crc) = 117-00000000
fpc-units-base#2.5.20100406-alt1	fpc(ctypes) = 117-00000000
fpc-units-base#2.5.20100406-alt1	fpc(dateutils) = 117-528140EF
fpc-units-base#2.5.20100406-alt1	fpc(dl) = 117-2BE81F91
fpc-units-base#2.5.20100406-alt1	fpc(dom) = 117-27CC59D3
fpc-units-base#2.5.20100406-alt1	fpc(dos) = 117-2BE81F91
fpc-units-base#2.5.20100406-alt1	fpc(dynlibs) = 117-EF37AEFB
fpc-units-base#2.5.20100406-alt1	fpc(errors) = 117-00000000
fpc-units-base#2.5.20100406-alt1	fpc(fprepos) = 117-9C1FE385
fpc-units-base#2.5.20100406-alt1	fpc(fpxmlrep) = 117-B1C16F03
fpc-units-base#2.5.20100406-alt1	fpc(gzio) = 117-2BE81F91
fpc-units-base#2.5.20100406-alt1	fpc(infblock) = 117-00000000
fpc-units-base#2.5.20100406-alt1	fpc(infcodes) = 117-00000000
fpc-units-base#2.5.20100406-alt1	fpc(inffast) = 117-00000000
fpc-units-base#2.5.20100406-alt1	fpc(inftrees) = 117-00000000
fpc-units-base#2.5.20100406-alt1	fpc(infutil) = 117-00000000


Вот вывод для *.ppu из нового пакета:

[slava@dubrline rtl]$ ls *.ppu |/usr/lib/rpm/fpc.req | head
fpc(baseunix) = 117-00000000
fpc(convutils) = 117-32696E8F
fpc(cpu) = 117-2BE81F91
fpc(cthreads) = 117-00000000
fpc(ctypes) = 117-00000000
fpc(cwstring) = 117-00000000
fpc(dl) = 117-2BE81F91
fpc(dos) = 117-2BE81F91
fpc(dynlibs) = 117-EF37AEFB
fpc(errors) = 117-00000000
[slava@dubrline rtl]$ ls *.ppu |/usr/lib/rpm/fpc.prov | head
fpc(baseunix) = 117-903C949E
fpc(charset) = 117-707B51D3
fpc(classes) = 117-7C5E1B19
fpc(clocale) = 117-38F1290E
fpc(cmem) = 117-A52D4CED
fpc(convutils) = 117-32A413AC
fpc(cpu) = 117-C1870EC9
fpc(crt) = 117-F64E0CFB
fpc(cthreads) = 117-A9E16FED
fpc(ctypes) = 117-EE47DF73

Вот такой патч проблему исправляет:

--- rpm-build-fpc-2.1/fpc.req.orig      2007-01-17 05:32:17.000000000 +0200
+++ rpm-build-fpc-2.1/fpc.req   2010-04-21 14:36:31.000000000 +0300
@@ -29,8 +29,7 @@ reqprov=$(echo "$dump" |awk '
        # interface and implementation
        /^Uses unit/ {
                req = tolower($3)
-               sub("[)]$", "")
-               reqcrc = toupper($NF)
+               reqcrc = toupper($7)
                printf "Requires: %s(%s) = %s-%s\n", fpc, req, ppuver, reqcrc
        }
        ' |sort -u)


Т.к. суть этого регекспа я не понял, сделал как знаю. Посмотрите плиз и исправьте, если эти изменения не корректны. Но так проблема решается.
Без этих исправления я не могу собрать новую версию.