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

Add _appdatadir macro definition

Browse source
This commit is contained in:
Andrey Bondrov 2016-10-12 19:06:48 +10:00
parent 7277dda01d
commit f80d4a2a6b
2 changed files with 27 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
rpm-5.4.10-appdatadir.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 2016-10-12 19:02:22.174240451 +1000
+++ rpm-5.4.10-patched/macros/mandriva 2016-10-12 19:03:44.337238294 +1000
@@ -92,6 +92,7 @@
%_localstatedir %{_var}
%_logdir %{_var}/log
%_libexecdir %{_libdir}
+%_appdatadir %{_datadir}/appdata
# mdvbz#62741
# standard systemd directories
diff -urN rpm-5.4.10/macros/mandriva.in rpm-5.4.10-patched/macros/mandriva.in
--- rpm-5.4.10/macros/mandriva.in 2016-10-12 19:02:22.186240451 +1000
+++ rpm-5.4.10-patched/macros/mandriva.in 2016-10-12 19:04:50.634236554 +1000
@@ -92,6 +92,7 @@
%_localstatedir %{_var}
%_logdir %{_var}/log
%_libexecdir %{_libdir}
+%_appdatadir %{_datadir}/appdata
# mdvbz#62741
# standard systemd directories

6
rpm.spec
View file

@ -61,7 +61,7 @@ Summary: The RPM package management system
Name: rpm
Epoch: 1
Version: %{libver}.%{minorver}
Release: %{?prereldate:0.%{prereldate}.}67
Release: %{?prereldate:0.%{prereldate}.}68
License: LGPLv2.1+
Group: System/Configuration/Packaging
Url: http://rpm5.org/
@ -512,6 +512,9 @@ Patch514: rpm-5.4.10-find-lang-kde5.patch
# Fix addsign check to skip PUBKEYS addition (to ensure reproducibility)
Patch515: rpm-5.4.10-fix-addsign-check.patch
# Add _appdatadir macro definition
Patch516: rpm-5.4.10-appdatadir.patch
BuildRequires: autoconf >= 2.57
BuildRequires: bzip2-devel
BuildRequires: automake >= 1.8
@ -1170,6 +1173,7 @@ This package contains the RPM API documentation generated in HTML format.
%patch513 -p1 -b .payload-no-hashed-inode
%patch514 -p1 -b .kde5-find-lang
%patch515 -p1 -b .fix-addsign-check
%patch516 -p1 -b .appdatadir~
#required by P55, P80, P81, P94..
./autogen.sh