Author: glen Date: Mon May 11 18:45:47 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- 1.517: add %tcl_version/%tcl_sitearch/%tcl_sitelib
---- Files affected:
packages/rpm-build-macros:
rpm-build-macros.spec (1.214 -> 1.215) , rpm.macros (1.516 -> 1.517)
---- Diffs:
================================================================
Index: packages/rpm-build-macros/rpm-build-macros.spec
diff -u packages/rpm-build-macros/rpm-build-macros.spec:1.214
packages/rpm-build-macros/rpm-build-macros.spec:1.215
--- packages/rpm-build-macros/rpm-build-macros.spec:1.214 Sat Mar 28
14:03:56 2009
+++ packages/rpm-build-macros/rpm-build-macros.spec Mon May 11 20:45:41 2009
@@ -1,5 +1,5 @@
# $Revision$, $Date$
-%define rpm_macros_rev 1.516
+%define rpm_macros_rev 1.517
%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
@@ -85,6 +85,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.215 2009/05/11 18:45:41 glen
+- 1.517: add %tcl_version/%tcl_sitearch/%tcl_sitelib
+
Revision 1.214 2009/03/28 13:03:56 arekm
- up to 1.516; fix env cleaning
================================================================
Index: packages/rpm-build-macros/rpm.macros
diff -u packages/rpm-build-macros/rpm.macros:1.516
packages/rpm-build-macros/rpm.macros:1.517
--- packages/rpm-build-macros/rpm.macros:1.516 Sat Mar 28 14:03:36 2009
+++ packages/rpm-build-macros/rpm.macros Mon May 11 20:45:41 2009
@@ -798,6 +798,12 @@
%{__xorg_abi_requires_lt videodrv xorg_xserver_videodrv_abi} \
%{nil}
+# TCL specific macro definitions.
+# TODO: when th tcl is fixed use tclsh to get version: %(echo 'puts
$tcl_version' | tclsh)
+%tcl_version %{expand:%%global tcl_version %(v=$(rpm -q --qf %{V} tcl | cut
-d. -f1,2); echo ${v:-ERROR})}%tcl_version
+%tcl_sitearch %{_libdir}/tcl%{tcl_version}
+%tcl_sitelib %{_datadir}/tcl%{tcl_version}
+
# Python specific macro definitions.
# python main version
%py_ver %{expand:%%global py_ver %(%{__python} -c
"import sys; print sys.version[:3]" 2>/dev/null || echo ERROR)}%py_ver
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/rpm-build-macros.spec?r1=1.214&r2=1.215&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/rpm.macros?r1=1.516&r2=1.517&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
