RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 16-Oct-2010 06:05:43
Branch: HEAD Handle: 2010101604054201
Added files:
rpm/macros tcl.in
Modified files:
rpm CHANGES Makefile.am configure.ac
rpm/macros macros.in
Log:
add tcl macros from mandriva.
Summary:
Revision Changes Path
1.3471 +1 -0 rpm/CHANGES
2.258 +2 -1 rpm/Makefile.am
2.464 +1 -0 rpm/configure.ac
1.36 +4 -1 rpm/macros/macros.in
1.1 +9 -0 rpm/macros/tcl.in
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3470 -r1.3471 CHANGES
--- rpm/CHANGES 16 Oct 2010 03:48:51 -0000 1.3470
+++ rpm/CHANGES 16 Oct 2010 04:05:43 -0000 1.3471
@@ -1,4 +1,5 @@
5.3.4 -> 5.4a1:
+ - proyvind: add tcl macros from mandriva.
- proyvind: add ruby macros from mandriva.
- proyvind: add macros from mandriva that's fairly generic enough to
possibly be of use to others, in mandriva/macros.
@@ .
patch -p0 <<'@@ .'
Index: rpm/Makefile.am
============================================================================
$ cvs diff -u -r2.257 -r2.258 Makefile.am
--- rpm/Makefile.am 16 Oct 2010 03:48:51 -0000 2.257
+++ rpm/Makefile.am 16 Oct 2010 04:05:43 -0000 2.258
@@ -135,7 +135,8 @@
pkgcfgdir = $(pkglibdir)/macros.d
pkgcfg_DATA = \
macros/java macros/libtool macros/mandriva macros/mono macros/perl \
- macros/pkgconfig macros/php macros/python macros/ruby macros/selinux
+ macros/pkgconfig macros/php macros/python macros/ruby macros/selinux \
+ macros/tcl
noinst_HEADERS = build.h debug.h system.h
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
============================================================================
$ cvs diff -u -r2.463 -r2.464 configure.ac
--- rpm/configure.ac 16 Oct 2010 03:51:05 -0000 2.463
+++ rpm/configure.ac 16 Oct 2010 04:05:43 -0000 2.464
@@ -2269,6 +2269,7 @@
macros/macros macros/macros.rpmbuild
macros/java macros/libtool macros/mandriva macros/mono macros/perl
macros/pkgconfig macros/php macros/python macros/ruby macros/selinux
+ macros/tcl
doc/Makefile
doc/manual/Makefile doc/fr/Makefile doc/ja/Makefile doc/ko/Makefile
doc/pl/Makefile doc/ru/Makefile doc/sk/Makefile
@@ .
patch -p0 <<'@@ .'
Index: rpm/macros/macros.in
============================================================================
$ cvs diff -u -r1.35 -r1.36 macros.in
--- rpm/macros/macros.in 16 Oct 2010 03:49:25 -0000 1.35
+++ rpm/macros/macros.in 16 Oct 2010 04:05:42 -0000 1.36
@@ -1,7 +1,7 @@
#/*! \page config_macros Default configuration: @USRLIBRPM@/macros
# \verbatim
#
-# $Id: macros.in,v 1.35 2010/10/16 03:49:25 pkarlsen Exp $
+# $Id: macros.in,v 1.36 2010/10/16 04:05:42 pkarlsen Exp $
#
# This is a global RPM configuration file. All changes made here will
# be lost when the rpm package is upgraded. Any per-system configuration
@@ -111,7 +111,6 @@
%__ssh @__SSH@
%__svn @__SVN@
%__tar @__TAR@
-%__tclsh @__TCLSH@
%__unzip @__UNZIP@
%__vcheck %{__perl} %{_rpmhome}/vcheck
%__xz @__XZ@
@@ -945,6 +944,10 @@
%{load:%{_usrlibrpm}/macros.d/ruby}
#------------------------------------------------------------------------
+# tcl(...) configuration.
+%{load:%{_usrlibrpm}/macros.d/tcl}
+
+#------------------------------------------------------------------------
# vendor specific macro configuration.
@distro_mac...@%{load:%{_usrlibrpm}/macros.d/%{_vendor}}
@@ .
patch -p0 <<'@@ .'
Index: rpm/macros/tcl.in
============================================================================
$ cvs diff -u -r0 -r1.1 tcl.in
--- /dev/null 2010-10-16 06:03:23.000000000 +0200
+++ tcl.in 2010-10-16 06:05:42.981418247 +0200
@@ -0,0 +1,9 @@
+# TCL specific macro definitions.
+# To make use of these macros insert the following line into your spec file:
+# %{load:%{_usrlibrpm}/macros.d/tcl}
+
+%__tclsh @__TCLSH@
+
+%tcl_version %(echo 'puts $tcl_version' | %{__tclsh})
+%tcl_sitelib %{_datadir}/tcl%{tcl_version}
+%tcl_sitearch %{_libdir}/tcl%{tcl_version}
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
