packages: rpm-build-macros/rpm-build-macros.spec, rpm-build-macros/rpm.macr...

glen glen at pld-linux.org
Fri Aug 20 12:02:59 CEST 2010


Author: glen                         Date: Fri Aug 20 10:02:59 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 1.571: add %%pear_package_print_optionalpackages

---- Files affected:
packages/rpm-build-macros:
   rpm-build-macros.spec (1.265 -> 1.266) , rpm.macros (1.570 -> 1.571) 

---- Diffs:

================================================================
Index: packages/rpm-build-macros/rpm-build-macros.spec
diff -u packages/rpm-build-macros/rpm-build-macros.spec:1.265 packages/rpm-build-macros/rpm-build-macros.spec:1.266
--- packages/rpm-build-macros/rpm-build-macros.spec:1.265	Thu Aug 19 14:35:58 2010
+++ packages/rpm-build-macros/rpm-build-macros.spec	Fri Aug 20 12:02:52 2010
@@ -1,5 +1,5 @@
 # $Revision$, $Date$
-%define		rpm_macros_rev	1.570
+%define		rpm_macros_rev	1.571
 %define		find_lang_rev	1.32
 Summary:	PLD Linux RPM build macros
 Summary(pl.UTF-8):	Makra do budowania pakietów RPM dla Linuksa PLD
@@ -90,6 +90,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.266  2010/08/20 10:02:52  glen
+- 1.571: add %%pear_package_print_optionalpackages
+
 Revision 1.265  2010/08/19 12:35:58  glen
 - 1.570: make pear install independant of configured timezone
 

================================================================
Index: packages/rpm-build-macros/rpm.macros
diff -u packages/rpm-build-macros/rpm.macros:1.570 packages/rpm-build-macros/rpm.macros:1.571
--- packages/rpm-build-macros/rpm.macros:1.570	Thu Aug 19 14:24:04 2010
+++ packages/rpm-build-macros/rpm.macros	Fri Aug 20 12:02:52 2010
@@ -1445,6 +1445,21 @@
 fi \
 %{nil}
 
+# Print optional package info for pear packages
+# Author: Elan Ruusamäe <glen at pld-linux.org>
+# Usage:
+#   %post -p <lua>
+#	%%pear_package_print_optionalpackages
+#
+# Requirements:
+# BuildRequires:	rpmbuild(macros) >= 1.571
+%pear_package_print_optionalpackages \
+f = io.open("%{_docdir}/%{name}-%{version}/optional-packages.txt", "r") \
+if f then \
+	for l in f:lines() do print(l); end \
+end \
+%{nil}
+
 
 # Register OpenLDAP schema.
 # Author: Elan Ruusamäe <glen at pld-linux.org>
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/rpm-build-macros.spec?r1=1.265&r2=1.266&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/rpm.macros?r1=1.570&r2=1.571&f=u



More information about the pld-cvs-commit mailing list