rpms/tcldom/devel tcldom.patch, NONE, 1.1 tcldom.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Michael Thomas (wart)
fedora-extras-commits at redhat.com
Thu Dec 15 04:58:02 UTC 2005
Author: wart
Update of /cvs/extras/rpms/tcldom/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4130/devel
Modified Files:
.cvsignore sources
Added Files:
tcldom.patch tcldom.spec
Log Message:
auto-import tcldom-3.1-2 on branch devel from tcldom-3.1-2.src.rpm
tcldom.patch:
--- NEW FILE tcldom.patch ---
diff -Naur --exclude '*.swp' tcldom-3.1/library/dom.tcl tcldom-3.1.new/library/dom.tcl
--- tcldom-3.1/library/dom.tcl 2004-02-25 12:10:28.000000000 -0800
+++ tcldom-3.1.new/library/dom.tcl 2005-12-13 14:57:29.000000000 -0800
@@ -15,9 +15,9 @@
# We need the xml package, so that we get Name defined
-package require xml 3.0
+package require xml 3.1
-package provide dom::tcl 3.0
+package provide dom::tcl 3.1
# Define generic constants
diff -Naur --exclude '*.swp' tcldom-3.1/library/xmlswitch.tcl tcldom-3.1.new/library/xmlswitch.tcl
--- tcldom-3.1/library/xmlswitch.tcl 2003-12-08 20:56:43.000000000 -0800
+++ tcldom-3.1.new/library/xmlswitch.tcl 2005-12-13 14:57:55.000000000 -0800
@@ -17,8 +17,8 @@
# We need the xml, dom and xpath packages
-package require xml 3.0
-package require dom 3.0
+package require xml 3.1
+package require dom 3.1
package require xpath 1.0
namespace eval xmlswitch {
diff -Naur --exclude '*.swp' tcldom-3.1/src/configure tcldom-3.1.new/src/configure
--- tcldom-3.1/src/configure 2003-04-04 14:07:50.000000000 -0800
+++ tcldom-3.1.new/src/configure 2005-11-27 13:50:34.000000000 -0800
@@ -1898,10 +1898,12 @@
# check in a few common install locations
if test x"${ac_cv_c_tclconfig}" = x ; then
- for i in `ls -d ${exec_prefix}/lib 2>/dev/null` \
+ for i in `ls -d ${libdir} 2>/dev/null` \
+ `ls -d ${exec_prefix}/lib 2>/dev/null` \
`ls -d ${prefix}/lib 2>/dev/null` \
`ls -d /usr/local/lib 2>/dev/null` \
`ls -d /usr/contrib/lib 2>/dev/null` \
+ `ls -d /usr/lib64 2>/dev/null` \
`ls -d /usr/lib 2>/dev/null` \
; do
if test -f "$i/tclConfig.sh" ; then
diff -Naur --exclude '*.swp' tcldom-3.1/src-libxml2/configure tcldom-3.1.new/src-libxml2/configure
--- tcldom-3.1/src-libxml2/configure 2005-11-03 22:36:59.000000000 -0800
+++ tcldom-3.1.new/src-libxml2/configure 2005-11-27 13:40:37.000000000 -0800
@@ -1539,10 +1539,12 @@
# check in a few common install locations
if test x"${ac_cv_c_tclconfig}" = x ; then
- for i in `ls -d ${exec_prefix}/lib 2>/dev/null` \
+ for i in `ls -d ${libdir} 2>/dev/null` \
+ `ls -d ${exec_prefix}/lib 2>/dev/null` \
`ls -d ${prefix}/lib 2>/dev/null` \
`ls -d /usr/local/lib 2>/dev/null` \
`ls -d /usr/contrib/lib 2>/dev/null` \
+ `ls -d /usr/lib64 2>/dev/null` \
`ls -d /usr/lib 2>/dev/null` \
; do
if test -f "$i/tclConfig.sh" ; then
@@ -5330,9 +5332,11 @@
LIBXML2_LIBDIR=""
for d in \
+ $libdir \
$with_xml2lib \
$exec_prefix/lib \
/usr/lib \
+ /usr/lib64 \
/usr/local/lib
do
if test -f "$d/libxml2.so" ; then
diff -Naur --exclude '*.swp' tcldom-3.1/src-libxml2/configure.in tcldom-3.1.new/src-libxml2/configure.in
--- tcldom-3.1/src-libxml2/configure.in 2005-05-20 07:07:35.000000000 -0700
+++ tcldom-3.1.new/src-libxml2/configure.in 2005-11-27 13:40:08.000000000 -0800
@@ -233,9 +233,11 @@
LIBXML2_LIBDIR=""
for d in \
+ $libdir \
$with_xml2lib \
$exec_prefix/lib \
/usr/lib \
+ /usr/lib64 \
/usr/local/lib
do
if test -f "$d/libxml2.so" ; then
diff -Naur --exclude '*.swp' tcldom-3.1/tclconfig/tcl.m4 tcldom-3.1.new/tclconfig/tcl.m4
--- tcldom-3.1/tclconfig/tcl.m4 2003-12-03 12:18:44.000000000 -0800
+++ tcldom-3.1.new/tclconfig/tcl.m4 2005-11-27 13:37:00.000000000 -0800
@@ -73,10 +73,12 @@
# check in a few common install locations
if test x"${ac_cv_c_tclconfig}" = x ; then
- for i in `ls -d ${exec_prefix}/lib 2>/dev/null` \
+ for i in `ls -d ${libdir} 2>/dev/null` \
+ `ls -d ${exec_prefix}/lib 2>/dev/null` \
`ls -d ${prefix}/lib 2>/dev/null` \
`ls -d /usr/local/lib 2>/dev/null` \
`ls -d /usr/contrib/lib 2>/dev/null` \
+ `ls -d /usr/lib64 2>/dev/null` \
`ls -d /usr/lib 2>/dev/null` \
; do
if test -f "$i/tclConfig.sh" ; then
--- NEW FILE tcldom.spec ---
Summary: TclDOM is a package that provides a DOM binding for the Tcl scripting language
Name: tcldom
Version: 3.1
Release: 2%{?dist}
License: BSD
Group: Development/Libraries
URL: http://tclxml.sourceforge.net/
Source: http://dl.sf.net/tclxml/tcldom-3.1.tar.gz
Patch0: tcldom.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: tcl tcl-devel libxml2-devel tclxml-devel
Requires: tcl tclxml tcllib libxml2
%description
This package provides a DOM binding for Tcl. It provides one of the following
implementations:
* A Tcl-only implementation (slow, but no compilation required),
* A wrapper for the Gnome libxml2 library [http://xmlsoft.org/]
(also fast and compatiable with TclXSLT/libxslt
[http://tclxml.sourceforge.net/tclxslt.html]).
%package libxml2
Summary: The Tcl dom parser built with the libxml2 xml parser
Group: Development/Libraries
Requires: tcldom = %{version} tclxml-libxml2
%description libxml2
This package provides an optimized Tcl dom parser built with the libxml2
xml parser.
%package devel
Summary: The Tcl dom parser development files
Group: Development/Libraries
Requires: tcldom = %{version} tclxml-devel
%description devel
Development headers and libraries needed to link new applications against
tcldom.
%prep
%setup -q
%patch0 -p1
%{__sed} -i 's/\r//' examples/tkxmllint.tcl
%build
cd src-libxml2
%configure
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
# We have to hand-install the base Tcl files since the configure script
# doesn't take care of that.
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}%{version}
install -m 0644 library/*.tcl $RPM_BUILD_ROOT/%{_datadir}/%{name}%{version}
sed -e 's/@VERSION@/%{version}/' < library/pkgIndex.tcl.in > $RPM_BUILD_ROOT/%{_datadir}/%{name}%{version}/pkgIndex.tcl
cd src-libxml2
make install DESTDIR=$RPM_BUILD_ROOT
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
%{_datadir}/%{name}%{version}
%doc ChangeLog README MANIFEST RELNOTES LICENSE
%doc docs/* examples/*
%files libxml2
%defattr(-,root,root)
%dir %{_libdir}/%{name}_libxml2%{version}
%{_libdir}/%{name}_libxml2%{version}/*.tcl
%{_libdir}/%{name}_libxml2%{version}/*.so
%files devel
%defattr(-,root,root)
%{_includedir}/*
%{_libdir}/%{name}libxml2Config.sh
%{_libdir}/%{name}_libxml2%{version}/*.a
%changelog
* Tue Dec 13 2005 Wart <wart at kobold.org> - 3.1-2
- Update patch to fix version numbers that weren't updated upstream
* Sun Nov 27 2005 Wart <wart at kobold.org> - 3.1-1
- Update to new upstream sources.
* Sat Nov 26 2005 Wart <wart at kobold.org> - 3.0-2
- Minor spec file changes to remove rpmlint warnings
* Fri Jun 17 2005 Wart <wart at kobold.org> - 3.0-1
- New spec file to conform to Fedora Core 4 standards.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tcldom/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 15 Dec 2005 04:57:26 -0000 1.1
+++ .cvsignore 15 Dec 2005 04:58:00 -0000 1.2
@@ -0,0 +1 @@
+tcldom-3.1.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tcldom/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 15 Dec 2005 04:57:26 -0000 1.1
+++ sources 15 Dec 2005 04:58:00 -0000 1.2
@@ -0,0 +1 @@
+b5af0e29e5cf2109d1f1a9b1a6ec2d81 tcldom-3.1.tar.gz
More information about the scm-commits
mailing list