Ported some things from RPM4, run ./autogen.sh in %%build

This commit is contained in:
Mikhail Novosyolov 2019-06-11 01:08:46 +03:00
parent c2410aefe9
commit e4a0e1c62b

View file

@ -1,4 +1,4 @@
%define commit ab01c1915dc2531573cc89245161ea51228a6a12 %define commit 9dc762cbb78c7dbe6bdd4c425f909e833472e82d
%define short_commit %(echo %{commit} | head -c 4) %define short_commit %(echo %{commit} | head -c 4)
# When updating, change commit hash above to the commit in # When updating, change commit hash above to the commit in
# https://abf.io/soft/rpm5 that you want to build from # https://abf.io/soft/rpm5 that you want to build from
@ -65,7 +65,7 @@ Summary: The RPM package management system
Name: rpm Name: rpm
Epoch: 1 Epoch: 1
Version: %{libver}.%{minorver} Version: %{libver}.%{minorver}
Release: 91.git%{short_commit} Release: 94.git%{short_commit}
License: LGPLv2.1+ License: LGPLv2.1+
Group: System/Configuration/Packaging Group: System/Configuration/Packaging
Url: http://rpm5.org/ Url: http://rpm5.org/
@ -584,9 +584,10 @@ This package contains the RPM API documentation generated in HTML format.
%setup -q -a5 -n rpm5-%{commit} %setup -q -a5 -n rpm5-%{commit}
mkdir -p cpu-os-macros mkdir -p cpu-os-macros
tar -zxf %{SOURCE3} -C cpu-os-macros tar -zxf %{SOURCE3} -C cpu-os-macros
./autogen.sh %apply_patches
%build %build
./autogen.sh
%configure2_5x --enable-nls \ %configure2_5x --enable-nls \
--with-pic \ --with-pic \
%if %{with debug} %if %{with debug}