Oddball build breakage from nss libraries moving to /lib...
This commit is contained in:
parent
3fd55367ca
commit
6a4e3b56e1
12
rpm-4.4.2.2-autofoo.patch
Normal file
12
rpm-4.4.2.2-autofoo.patch
Normal file
@ -0,0 +1,12 @@
|
||||
diff -up rpm-4.4.2.2/Makefile.am.xxxx rpm-4.4.2.2/Makefile.am
|
||||
--- rpm-4.4.2.2/Makefile.am.xxxx 2008-01-15 08:07:50.000000000 -0500
|
||||
+++ rpm-4.4.2.2/Makefile.am 2008-01-15 08:08:03.000000000 -0500
|
||||
@@ -94,7 +94,7 @@ rpm2cpio_SOURCES = $(top_srcdir)/rpm2cpi
|
||||
rpm2cpio_LDFLAGS = $(myLDFLAGS)
|
||||
rpm2cpio_LDADD = $(myLDADD) @LIBMISC@
|
||||
|
||||
-$(PROGRAMS): $(myLDADD) @WITH_APIDOCS_TARGET@
|
||||
+$(PROGRAMS): @WITH_APIDOCS_TARGET@
|
||||
|
||||
.PHONY: splint
|
||||
splint:
|
3
rpm.spec
3
rpm.spec
@ -29,6 +29,7 @@ Patch16: rpm-4.4.2.2-gcc43.patch
|
||||
Patch17: rpm-4.4.2.2-secondary-arch-macros.patch
|
||||
Patch18: rpm-4.4.2.2-no-targetreset.patch
|
||||
Patch19: rpm-4.4.2.2-pkgconfig-path.patch
|
||||
Patch20: rpm-4.4.2.2-autofoo.patch
|
||||
|
||||
# XXX Beware, this is one murky license, partially GPL/LGPL dual-licensed
|
||||
# and several different components with their own licenses included...
|
||||
@ -162,6 +163,7 @@ that will manipulate RPM packages and databases.
|
||||
%patch17 -p1 -b .archmacros
|
||||
%patch18 -p1 -b .notargetreset
|
||||
%patch19 -p1 -b .pkgconfig-path
|
||||
%patch20 -p1 -b .autofoo
|
||||
|
||||
# force external popt
|
||||
rm -rf popt/
|
||||
@ -421,6 +423,7 @@ exit 0
|
||||
- install x86 arch macros on x86_64 (#194123)
|
||||
- dont mess up target os+arch on rpmrc include (#232429)
|
||||
- set pkg-config path based on target (#212522)
|
||||
- fix funky automake breakage from nss libraries moving to /lib*
|
||||
|
||||
* Fri Jan 04 2008 Panu Matilainen <pmatilai@redhat.com> 4.4.2.2-12
|
||||
- fix segfault in devel symlink dependency generation from Mark Salter (#338971)
|
||||
|
Loading…
Reference in New Issue
Block a user