|
Lines 424-429
Link Here
|
| 424 |
def gen_spec(pkg, source, fl): |
424 |
def gen_spec(pkg, source, fl): |
| 425 |
header = source.header_for(pkg) |
425 |
header = source.header_for(pkg) |
| 426 |
|
426 |
|
|
|
427 |
if '/usr/lib/libGL.so.1' in fl: |
| 428 |
GL='libGL.so.1' |
| 429 |
fl.remove('/usr/lib/libGL.so.1') |
| 430 |
else: |
| 431 |
GL='' |
| 432 |
|
| 427 |
return """# Autogenerated. You should not have seen it at all. |
433 |
return """# Autogenerated. You should not have seen it at all. |
| 428 |
Name: ~(mangled-name)s |
434 |
Name: ~(mangled-name)s |
| 429 |
|
435 |
|
|
Lines 488-493
Link Here
|
| 488 |
|
494 |
|
| 489 |
echo 1 >"$file" |
495 |
echo 1 >"$file" |
| 490 |
(/usr/lib/rpm/${0##*/}; echo $? >"$file") |fgrep -v GLIBC_PRIVATE ||: |
496 |
(/usr/lib/rpm/${0##*/}; echo $? >"$file") |fgrep -v GLIBC_PRIVATE ||: |
|
|
497 |
case ${0##*/} in |
| 498 |
find-provides) |
| 499 |
echo "~(provides)s" |
| 500 |
;; |
| 501 |
esac |
| 491 |
exit "$(cat "$file")" |
502 |
exit "$(cat "$file")" |
| 492 |
|
503 |
|
| 493 |
EOF |
504 |
EOF |
|
Lines 520-525
Link Here
|
| 520 |
'define-ext_epoch': header['epoch'] and |
531 |
'define-ext_epoch': header['epoch'] and |
| 521 |
('%%define ext_epoch %s' % header['epoch']) or '', |
532 |
('%%define ext_epoch %s' % header['epoch']) or '', |
| 522 |
'dep-list': auto_dep_list(header, source), |
533 |
'dep-list': auto_dep_list(header, source), |
|
|
534 |
'provides': GL, |
| 523 |
}, |
535 |
}, |
| 524 |
header, |
536 |
header, |
| 525 |
HacksDict(hacks.get(pkg, {}))) |
537 |
HacksDict(hacks.get(pkg, {}))) |
|
Lines 560-570
Link Here
|
| 560 |
read_config(args[0]) |
572 |
read_config(args[0]) |
| 561 |
|
573 |
|
| 562 |
repo = Repo('Sisyphus', vars['origin'], vars['flavor']) |
574 |
repo = Repo('Sisyphus', vars['origin'], vars['flavor']) |
|
|
575 |
repo2 = Repo('Sisyphus', vars['origin2'], vars['flavor2']) |
| 576 |
noarch2 = Arch(repo2, 'noarch', []) |
| 577 |
source2 = Arch(repo2, vars['source'], [noarch2]) |
| 563 |
noarch = Arch(repo, 'noarch', []) |
578 |
noarch = Arch(repo, 'noarch', []) |
| 564 |
source = Arch(repo, vars['source'], [noarch]) |
579 |
source = Arch(repo, vars['source'], [noarch,source2,noarch2]) |
| 565 |
target = Arch(repo, vars['target'], [noarch]) |
580 |
target = Arch(repo, vars['target'], [noarch]) |
| 566 |
shadow_repo = Repo('biarch', vars['shadow'], vars['flavor']) |
581 |
shadow_repo = Repo('biarch', vars['shadow'], vars['flavor']) |
| 567 |
shadow = Arch(shadow_repo, vars['source'], [source, noarch]) |
582 |
shadow = Arch(shadow_repo, vars['source'], [source,noarch,source2,noarch2]) |
| 568 |
|
583 |
|
| 569 |
new_packages = False |
584 |
new_packages = False |
| 570 |
|
585 |
|
