diff --git a/rpm.spec b/rpm.spec index 13bfcbc..92f77cf 100644 --- a/rpm.spec +++ b/rpm.spec @@ -533,7 +533,7 @@ Patch520: rpm-5.4.10-Multithreaded-XZ.patch Patch521: rpm-5.4.10-Use-multithreaded-XZ-by-default-for-both-binary-and-.patch Patch522: rpm-5.4.10-multithreaded-xz-memlimit.patch Patch523: rpm-5.4.10-Parse-private-dependencies-from-pkgconfig-files.patch -Patch524: rpm-5.4.10-Force-AutoReq-on-top-of-noautoreq.patch +#Patch524: rpm-5.4.10-Force-AutoReq-on-top-of-noautoreq.patch BuildRequires: autoconf >= 2.57 BuildRequires: bzip2-devel @@ -1037,9 +1037,9 @@ This package contains the RPM API documentation generated in HTML format. %patch0 -p1 -b .squirrel3~ %patch1 -p1 -b .makeinstall_qt~ %patch11 -p1 -b .ru~ -%if 0 -%patch15 -p1 -b .trigger_once~ -%endif +#%if 0 +#%patch15 -p1 -b .trigger_once~ +#%endif %patch29 -p1 -b .specfile~ %patch31 -p1 -b .rpm_qa~ #%%patch32 -p1 -b .clean~ @@ -1119,6 +1119,7 @@ This package contains the RPM API documentation generated in HTML format. %patch140 -p1 -b .rpmv3~ %patch143 -p1 -b .mono_newline~ %patch144 -p1 -b .urpm~ +%patch145 -p1 %patch146 -p1 -b .nosig~ %patch147 -p1 %patch149 -p1 -b .typo~ @@ -1205,14 +1206,14 @@ This package contains the RPM API documentation generated in HTML format. %patch523 -p1 -b .ParsePkgconfigPrivate # rpm-5.4.10-Force-AutoReq-on-top-of-noautoreq.patch # Apply it with offsets which appear because of a lot of previous patches -patch -p1 < %{PATCH524} +#patch -p1 < %{PATCH524} #required by P55, P80, P81, P94.. ./autogen.sh mkdir -p cpu-os-macros tar -zxf %{SOURCE3} -C cpu-os-macros -%patch145 -p1 +#%patch145 -p1 # patch507 -p0 -b .hardening_cpu_os_macros~ %build