[packages/rpm] restore macros.lang file from 4.5 branch (f622fc6)
glen
glen at pld-linux.org
Mon Oct 8 23:46:48 CEST 2012
commit b1541d4c520980f1e15d07220f64b77b96a5dd92
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Tue Oct 9 00:46:04 2012 +0300
restore macros.lang file from 4.5 branch (f622fc6)
macros.lang | 6 ++++++
macros.local | 2 --
rpm.spec | 3 +++
3 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/rpm.spec b/rpm.spec
index f51704e..a4673e4 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -88,6 +88,7 @@ Source23: rpm.noautoreqdep
Source24: rpm.noautoreqfiles
Source25: %{name}-php-requires.php
Source26: rpmdb_checkversion.c
+Source27: macros.lang
Patch0: %{name}-branch.patch
Patch1: %{name}-man_pl.patch
Patch2: %{name}-popt-aliases.patch
@@ -1091,6 +1092,7 @@ install %{SOURCE15} $RPM_BUILD_ROOT%{_bindir}/banner.sh
install -d $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo
install %{SOURCE18} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros
+install %{SOURCE27} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.lang
install %{SOURCE19} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautocompressdoc
install %{SOURCE20} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautoprov
install %{SOURCE21} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautoprovfiles
@@ -1196,6 +1198,7 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
%attr(755,root,root) /bin/rpm
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/rpm/macros
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/rpm/macros.lang
%dir %{_sysconfdir}/rpm/sysinfo
# these are ok to be replaced
%config %verify(not md5 mtime size) %{_sysconfdir}/rpm/sysinfo/*
diff --git a/macros.lang b/macros.lang
new file mode 100644
index 0000000..370fc45
--- /dev/null
+++ b/macros.lang
@@ -0,0 +1,6 @@
+# Customized rpm macros - global for host
+#
+# A colon separated list of desired locales to be installed;
+# "all" means install all locale specific files.
+#
+#%%_install_langs pl_PL:en_US
diff --git a/macros.local b/macros.local
index 635d1a7..37201ba 100644
--- a/macros.local
+++ b/macros.local
@@ -1,7 +1,5 @@
# customized rpm macros - global for host
#
-#%_install_langs pl_PL:en_US
-#
# remove or replace with file_contexts path if you want to use custom
# SELinux file contexts policy instead of one stored in packages payload
%_install_file_context_path %{nil}
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/b1541d4c520980f1e15d07220f64b77b96a5dd92
More information about the pld-cvs-commit
mailing list