rpms/tclxml/devel tclxml.patch, NONE, 1.1 tclxml.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Michael Thomas (wart)
fedora-extras-commits at redhat.com
Mon Dec 5 17:56:37 UTC 2005
Author: wart
Update of /cvs/extras/rpms/tclxml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5208/devel
Modified Files:
.cvsignore sources
Added Files:
tclxml.patch tclxml.spec
Log Message:
auto-import tclxml-3.1-1 on branch devel from tclxml-3.1-1.src.rpm
tclxml.patch:
--- NEW FILE tclxml.patch ---
diff -Naur --exclude '*.swp' tclxml-3.1/configure tclxml-3.1.new/configure
--- tclxml-3.1/configure 2005-11-03 22:26:33.000000000 -0800
+++ tclxml-3.1.new/configure 2005-11-26 23:47:56.000000000 -0800
@@ -1530,7 +1530,8 @@
# 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` \
diff -Naur --exclude '*.swp' tclxml-3.1/expat/configure tclxml-3.1.new/expat/configure
--- tclxml-3.1/expat/configure 2004-08-14 00:41:11.000000000 -0700
+++ tclxml-3.1.new/expat/configure 2005-11-26 23:50:36.000000000 -0800
@@ -1532,7 +1532,8 @@
# 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` \
diff -Naur --exclude '*.swp' tclxml-3.1/expat/Makefile.in tclxml-3.1.new/expat/Makefile.in
--- tclxml-3.1/expat/Makefile.in 2002-10-09 14:17:21.000000000 -0700
+++ tclxml-3.1.new/expat/Makefile.in 2005-11-27 12:46:23.000000000 -0800
@@ -173,6 +173,7 @@
SHARED_BUILD = @SHARED_BUILD@
INCLUDES = @TCL_INCLUDES@ \
+ -I$(srcdir)/../include \
-I$(srcdir)/xmltok \
-I$(srcdir)/xmlparse \
-I$(srcdir)/xmlwf
diff -Naur --exclude '*.swp' tclxml-3.1/libxml2/configure tclxml-3.1.new/libxml2/configure
--- tclxml-3.1/libxml2/configure 2005-11-03 22:26:52.000000000 -0800
+++ tclxml-3.1.new/libxml2/configure 2005-11-26 23:55:32.000000000 -0800
@@ -1540,7 +1540,8 @@
# 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` \
@@ -5468,7 +5469,9 @@
for d in \
$with_xml2lib \
$exec_prefix/lib \
+ $libdir \
/usr/lib \
+ /usr/lib64 \
/usr/local/lib
do
if test -f "$d/libxml2.so" ; then
diff -Naur --exclude '*.swp' tclxml-3.1/libxml2/configure.in tclxml-3.1.new/libxml2/configure.in
--- tclxml-3.1/libxml2/configure.in 2004-08-14 00:41:11.000000000 -0700
+++ tclxml-3.1.new/libxml2/configure.in 2005-11-26 23:54:28.000000000 -0800
@@ -247,7 +247,9 @@
for d in \
$with_xml2lib \
$exec_prefix/lib \
+ $libdir \
/usr/lib \
+ /usr/lib64 \
/usr/local/lib
do
if test -f "$d/libxml2.so" ; then
diff -Naur --exclude '*.swp' tclxml-3.1/tclconfig/tcl.m4 tclxml-3.1.new/tclconfig/tcl.m4
--- tclxml-3.1/tclconfig/tcl.m4 2003-12-03 12:06:35.000000000 -0800
+++ tclxml-3.1.new/tclconfig/tcl.m4 2005-11-27 11:58:42.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 tclxml.spec ---
Summary: TclXML is a package that provides XML parsing for the Tcl scripting language
Name: tclxml
Version: 3.1
Release: 1%{?dist}
License: BSD
Group: Development/Libraries
URL: http://tclxml.sourceforge.net/
Source: http://dl.sf.net/tclxml/tclxml-3.1.tar.gz
Patch0: tclxml.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: tcl tcl-devel libxml2-devel expat-devel
Requires: tcl tcllib
%description
TclXML is a package that provides XML parsing for the Tcl scripting language.
It has three implementations of XML parsers: one written purely in Tcl
and wrappers for the expat and Gnome libxml2 C libraries.
%package expat
Summary: The Tcl xml parser built with the expat xml parser
Group: Development/Libraries
Requires: tclxml = %{version}
%description expat
TclXML is a package that provides optimized XML parsing for the Tcl
scripting language. This implementation is built against the expat XML
parser.
%package libxml2
Summary: The Tcl xml parser built with the libxml2 xml parser
Group: Development/Libraries
Requires: tclxml = %{version}
%description libxml2
TclXML is a package that provides optimized XML parsing for the Tcl
scripting language. This implementation is built against the libxml2
xml parser.
%package devel
Summary: Development files for the tclxml packages
Group: Development/Libraries
Requires: tclxml = %{version}
%description devel
Development header files for the tclxml packages. This includes the
header files for the base, expat, and libxml2 subpackages.
%prep
%setup -q
%patch0 -p1
# Clean up rpmlint warning about line endings on
# one of the documentation files.
%{__sed} -i 's/\r//' doc/README.xml
# Remove execute permission bits on the source files to
# clean up rpmlint warnings.
chmod a-x README ChangeLog
chmod a-x include/tclxml/tclxml.h
chmod a-x expat/xmltok/*.c
chmod a-x expat/xmltok/*.h
chmod a-x expat/xmlwf/*.h
chmod a-x expat/xmlwf/*.c
chmod a-x expat/xmlparse/*.h
chmod a-x expat/xmlparse/*.c
chmod a-x libxml2/*.c
chmod a-x tclexpat.c
chmod a-x tclxml.c
#autoreconf
#cd expat
#autoreconf
#cd ../libxml2
#autoreconf
%build
%configure
make %{?_smp_mflags}
cd expat
%configure --with-Tclxml=..
make %{?_smp_mflags}
cd ../libxml2
%configure --with-Tclxml=..
make %{?_smp_mflags}
%install
make install DESTDIR=$RPM_BUILD_ROOT
cd expat
make install DESTDIR=$RPM_BUILD_ROOT
cd ../libxml2
make install DESTDIR=$RPM_BUILD_ROOT
# Remove the following header files which really don't need
# to be installed. They conflict with headers from
# libwww-devel
rm -f $RPM_BUILD_ROOT/usr/include/xmlparse.h
rm -f $RPM_BUILD_ROOT/usr/include/xmltok.h
rm -f $RPM_BUILD_ROOT/usr/include/xmlrole.h
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
%{_libdir}/Tclxml%{version}/*.so
%{_libdir}/Tclxml%{version}/*.tcl
%doc LICENSE ANNOUNCE ChangeLog README RELNOTES
%doc doc/*
%files expat
%defattr(-,root,root)
%{_libdir}/Tclexpat%{version}
%files libxml2
%defattr(-,root,root)
%{_libdir}/TclXML_libxml2%{version}
%files devel
%defattr(-,root,root)
%{_includedir}/*
%{_libdir}/TclxmlConfig.sh
%{_libdir}/Tclxml%{version}/*.a
%changelog
* Sat Nov 26 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-3
- Remove dependency on dos2unix with clever sed command.
* Fri Nov 25 2005 Wart <wart at kobold.org> - 3.0-2
- Fix file permissions to clean up rpmlint warnings.
- Add BR: dos2unix to remove DOS line endings on a documentation file.
- Other minor fixes to clean up rpmlint warnings.
* Fri Jun 17 2005 Wart <wart at kobold.org> - 3.0-1
- Updated spec file to conform to Fedora Core 4 standards.
- Move autoreconf from the build to the prep stage.
* Tue Jan 18 2005 Wart <wart at kobold.org> - 3.0-0.fdr.5
- Fix typo in version string for subpackage dependencies.
- Don't include the .a library in the base package.
* Fri Nov 5 2004 Wart <wart at kobold.org> - 3.0-0.fdr.4
- Add epoch to version dependencies in spec file.
- Added additional doc files.
* Thu Nov 4 2004 Wart <wart at kobold.org> - 3.0-0.fdr.3
- enable building on x86_64
* Thu Nov 4 2004 Wart <wart at kobold.org> - 3.0-0.fdr.2
- Clean up rpmlint warnings.
* Thu Nov 4 2004 Wart <wart at kobold.org> - 3.0-0.fdr.1
- Added Fedora-style spec file.
- Allow building generic RPMs from the Makefile.
- Fix VPATH problems with newer versions of autoconf tools.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tclxml/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 5 Dec 2005 17:54:56 -0000 1.1
+++ .cvsignore 5 Dec 2005 17:56:35 -0000 1.2
@@ -0,0 +1 @@
+tclxml-3.1.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tclxml/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 5 Dec 2005 17:54:56 -0000 1.1
+++ sources 5 Dec 2005 17:56:35 -0000 1.2
@@ -0,0 +1 @@
+35de63a4ceba7a6fdb85dd1a62f2e881 tclxml-3.1.tar.gz
More information about the fedora-extras-commits
mailing list