Djam/rpm
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/rpm.git synced 2025-02-24 02:43:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add makeinstall_qt macro to handle install from qmake-generated makefiles

Browse source
This commit is contained in:
Andrey Bondrov 2016-04-01 20:41:34 +10:00
parent 0121a5aa48
commit 7b106558ac
2 changed files with 26 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
rpm-5.4.10-makeinstall_qt.patch Normal file
View file

@ -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

5
rpm.spec
View file

@ -61,7 +61,7 @@ Summary: The RPM package management system
Name: rpm Name: rpm
Epoch: 1 Epoch: 1
Version: %{libver}.%{minorver} Version: %{libver}.%{minorver}
Release: %{?prereldate:0.%{prereldate}.}61 Release: %{?prereldate:0.%{prereldate}.}62
License: LGPLv2.1+ License: LGPLv2.1+
Group: System/Configuration/Packaging Group: System/Configuration/Packaging
Url: http://rpm5.org/ Url: http://rpm5.org/
@ -80,6 +80,8 @@ Source4: legacy_compat.macros
Source5: RPMBDB-0.1.tar.xz Source5: RPMBDB-0.1.tar.xz
# add squirrel3 support # add squirrel3 support
Patch0: rpm-5.4.10-squirrel3.patch 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) # TODO: make conditional & disabled through macro by default (enable for legacy compatibility)
# status: to be removed later # status: to be removed later
Patch2: rpm-5.4.9-non-pre-scripts-dont-fail.patch 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 %setup -q -a5
%patch111 -p1 -b .script_macros~ %patch111 -p1 -b .script_macros~
%patch0 -p1 -b .squirrel3~ %patch0 -p1 -b .squirrel3~
%patch1 -p1 -b .makeinstall_qt~
%patch2 -p1 -b .scriptlet~ %patch2 -p1 -b .scriptlet~
%patch3 -p1 -b .doc_conflicts~ %patch3 -p1 -b .doc_conflicts~
%patch11 -p1 -b .ru~ %patch11 -p1 -b .ru~