restore macros.lang file from 4.5 branch (f622fc6)

diff --git a/macros.lang b/macros.lang
new file mode 100644 (file)
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 635d1a71323b6a5da3cd240c8b4f1daa70aee745..37201ba252b3c96c6822caa6238cd2c461d1313f 100644 (file)
--- 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}

diff --git a/rpm.spec b/rpm.spec
index f51704e17a683d70c3f92fa57f1def8e0c1135d6..a4673e47ef8345b4a2071ddbb7b3d47578fd197d 100644 (file)
--- 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/*