diff --git a/rpm-5.4.10-makeinstall_qt.patch b/rpm-5.4.10-makeinstall_qt.patch new file mode 100644 index 0000000..db1d351 --- /dev/null +++ b/rpm-5.4.10-makeinstall_qt.patch @@ -0,0 +1,22 @@ +diff -urN rpm-5.4.10/macros/mandriva rpm-5.4.10-patched/macros/mandriva +--- rpm-5.4.10/macros/mandriva 2012-07-07 04:02:38.000000000 +1100 ++++ rpm-5.4.10-patched/macros/mandriva 2016-04-01 20:39:01.781545961 +1000 +@@ -70,6 +70,7 @@ + + %make %{__make} %{_smp_mflags} + %makeinstall_std make DESTDIR=%{?buildroot:%{buildroot}} install ++%makeinstall_qt make INSTALL_ROOT=%{?buildroot:%{buildroot}} install STRIP=true + + # mdvbz#62322 + %__grep /bin/grep +diff -urN rpm-5.4.10/macros/mandriva.in rpm-5.4.10-patched/macros/mandriva.in +--- rpm-5.4.10/macros/mandriva.in 2012-05-20 07:35:44.000000000 +1100 ++++ rpm-5.4.10-patched/macros/mandriva.in 2016-04-01 20:38:32.015548091 +1000 +@@ -70,6 +70,7 @@ + + %make %{__make} %{_smp_mflags} + %makeinstall_std make DESTDIR=%{?buildroot:%{buildroot}} install ++%makeinstall_qt make INSTALL_ROOT=%{?buildroot:%{buildroot}} install STRIP=true + + # mdvbz#62322 + %__grep /bin/grep diff --git a/rpm.spec b/rpm.spec index d03ac53..ac4b58c 100644 --- a/rpm.spec +++ b/rpm.spec @@ -61,7 +61,7 @@ Summary: The RPM package management system Name: rpm Epoch: 1 Version: %{libver}.%{minorver} -Release: %{?prereldate:0.%{prereldate}.}61 +Release: %{?prereldate:0.%{prereldate}.}62 License: LGPLv2.1+ Group: System/Configuration/Packaging Url: http://rpm5.org/ @@ -80,6 +80,8 @@ Source4: legacy_compat.macros Source5: RPMBDB-0.1.tar.xz # add squirrel3 support Patch0: rpm-5.4.10-squirrel3.patch +# add makeinstall_qt macro to handle install from qmake-generated makefiles +Patch1: rpm-5.4.10-makeinstall_qt.patch # TODO: make conditional & disabled through macro by default (enable for legacy compatibility) # status: to be removed later Patch2: rpm-5.4.9-non-pre-scripts-dont-fail.patch @@ -1011,6 +1013,7 @@ This package contains the RPM API documentation generated in HTML format. %setup -q -a5 %patch111 -p1 -b .script_macros~ %patch0 -p1 -b .squirrel3~ +%patch1 -p1 -b .makeinstall_qt~ %patch2 -p1 -b .scriptlet~ %patch3 -p1 -b .doc_conflicts~ %patch11 -p1 -b .ru~