SPECS (AC-branch): rpm.spec - move %_install_langs to separate file: /etc/r...

glen glen at pld-linux.org
Tue Oct 7 12:09:44 CEST 2008


Author: glen                         Date: Tue Oct  7 10:09:44 2008 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- move %_install_langs to separate file: /etc/rpm/macros.lang (for better rpm updates); rel 85

---- Files affected:
SPECS:
   rpm.spec (1.837.2.42.2.61 -> 1.837.2.42.2.62) 

---- Diffs:

================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.837.2.42.2.61 SPECS/rpm.spec:1.837.2.42.2.62
--- SPECS/rpm.spec:1.837.2.42.2.61	Fri Oct  3 00:15:10 2008
+++ SPECS/rpm.spec	Tue Oct  7 12:09:39 2008
@@ -36,7 +36,7 @@
 Summary(uk.UTF-8):	Менеджер пакетів від RPM
 Name:		rpm
 Version:	4.4.9
-Release:	84
+Release:	85
 License:	LGPL
 Group:		Base
 Source0:	http://rpm5.org/files/rpm/rpm-4.4/%{name}-%{version}.tar.gz
@@ -940,7 +940,6 @@
 cat > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros <<EOF
 # customized rpm macros - global for host
 #
-#%%_install_langs pl_PL:en_US
 %%distribution PLD
 #
 # remove or replace with file_contexts path if you want to use custom
@@ -956,6 +955,14 @@
 #%%_excludedocs   1
 EOF
 
+cat > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.lang <<EOF
+# 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
+EOF
+
 cat > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/noautoprovfiles <<EOF
 # global list of files (regexps) which don't generate Provides
 EOF
@@ -1143,6 +1150,7 @@
 #%attr(755,root,root) %{_bindir}/rpmverify
 
 %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/*
@@ -1362,6 +1370,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.837.2.42.2.62  2008/10/07 10:09:39  glen
+- move %_install_langs to separate file: /etc/rpm/macros.lang (for better rpm updates); rel 85
+
 Revision 1.837.2.42.2.61  2008/10/02 22:15:10  glen
 - do disable patch; rel 83
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/rpm.spec?r1=1.837.2.42.2.61&r2=1.837.2.42.2.62&f=u



More information about the pld-cvs-commit mailing list