29427 2013-10-03 21:48:12 +0400 bugfix for fixup-pkgconfig 2013-10-28 21:12:54 +0400 1 1 4 Development Sisyphus rpm-build unstable all Linux CLOSED FIXED P3 normal --- 1 viy placeholder arseny glebfm imz ldv placeholder vt qa-sisyphus oldest_to_newest 142966 0 viy 2013-10-03 21:48:12 +0400 правило для cmake для pc файлов генрирует pc файлы с пробелом после prefix= , и т.д. наподобие prefix=[space]/usr такие pc файлы роняют fixup-pkgconfig. предложенный патч лечит fixup-pkgconfig чтобы он не падал. diff --git a/scripts/fixup-pkgconfig.in b/scripts/fixup-pkgconfig.in index e5ef460..3cb6052 100755 --- a/scripts/fixup-pkgconfig.in +++ b/scripts/fixup-pkgconfig.in @@ -33,7 +33,7 @@ fix() local includedir= local libdir= - sed -ne "s/^\(\([a-z_]*\)\(prefix\|dir\|path\)\)=\(.*\)\$/local \1=\4/pg + sed -ne "s/^\(\([a-z_]*\)\(prefix\|dir\|path\)\)=[[:space:]]*\(.*\)\$/lo # source parameters ~ 142967 1 5950 viy 2013-10-03 21:50:37 +0400 Created attachment 5950 патч 143511 2 repository-robot 2013-10-28 21:12:54 +0400 rpm-4.0.4-alt100.73 -> sisyphus: * Mon Oct 28 2013 Dmitry V. Levin <ldv@altlinux> 4.0.4-alt100.73 - fixup-pkgconfig: workaround some broken pkgconfig files (closes: #29427). - Fixed build with new automake. 5950 2013-10-03 21:50:37 +0400 2013-10-03 21:50:54 +0400 патч fixup-pkgconfig-fix.patch text/plain 475 viy ZGlmZiAtLWdpdCBhL3NjcmlwdHMvZml4dXAtcGtnY29uZmlnLmluIGIvc2NyaXB0cy9maXh1cC1w a2djb25maWcuaW4KaW5kZXggZTVlZjQ2MC4uM2NiNjA1MiAxMDA3NTUKLS0tIGEvc2NyaXB0cy9m aXh1cC1wa2djb25maWcuaW4KKysrIGIvc2NyaXB0cy9maXh1cC1wa2djb25maWcuaW4KQEAgLTMz LDcgKzMzLDcgQEAgZml4KCkKIAogCWxvY2FsIGluY2x1ZGVkaXI9CiAJbG9jYWwgbGliZGlyPQot CXNlZCAtbmUgInMvXlwoXChbYS16X10qXClcKHByZWZpeFx8ZGlyXHxwYXRoXClcKT1cKC4qXClc JC9sb2NhbCBcMT1cNC9wZyIgIiRmIiA+IiRUTVBGSUxFIiB8fCByZXR1cm4gMQorCXNlZCAtbmUg InMvXlwoXChbYS16X10qXClcKHByZWZpeFx8ZGlyXHxwYXRoXClcKT1bWzpzcGFjZTpdXSpcKC4q XClcJC9sb2NhbCBcMT1cNC9wZyIgIiRmIiA+IiRUTVBGSUxFIiB8fCByZXR1cm4gMQogCiAJIyBz b3VyY2UgcGFyYW1ldGVycwogCg==