rpms/tdom/FC-6 tdom-0.8.0-sourcelist.patch, NONE, 1.1 tdom-0.8.0-tclconfig.patch, NONE, 1.1 tdom.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Michael Thomas (wart) fedora-extras-commits at redhat.com
Sun May 6 22:06:08 UTC 2007


Author: wart

Update of /cvs/pkgs/rpms/tdom/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1147

Modified Files:
	.cvsignore sources 
Added Files:
	tdom-0.8.0-sourcelist.patch tdom-0.8.0-tclconfig.patch 
	tdom.spec 
Log Message:
Initial import on FC-6 branch



tdom-0.8.0-sourcelist.patch:

--- NEW FILE tdom-0.8.0-sourcelist.patch ---
--- Makefile.in.orig	2006-11-25 18:43:34.000000000 -0800
+++ Makefile.in	2007-05-01 10:17:29.000000000 -0700
@@ -27,26 +27,26 @@
 # unix subdirectory.
 #========================================================================
 
-EXPAT_SOURCES   = xmlrole.c      \
-                  xmltok.c       \
-                  xmlparse.c
-
-TDOM_SOURCES    = xmlsimple.c    \
-                  utf8conv.c     \
-                  dom.c          \
-                  domalloc.c     \
-                  domhtml.c      \
-                  domxpath.c     \
-                  domxslt.c      \
-                  domlock.c      \
-                  tcldom.c       \
-                  nodecmd.c      \
-                  tdominit.c     \
-                  tclexpat.c     \
-                  tdomStubInit.c
+EXPAT_SOURCES   = expat/xmlrole.c      \
+                  expat/xmltok.c       \
+                  expat/xmlparse.c
+
+TDOM_SOURCES    = generic/xmlsimple.c    \
+                  generic/utf8conv.c     \
+                  generic/dom.c          \
+                  generic/domalloc.c     \
+                  generic/domhtml.c      \
+                  generic/domxpath.c     \
+                  generic/domxslt.c      \
+                  generic/domlock.c      \
+                  generic/tcldom.c       \
+                  generic/nodecmd.c      \
+                  generic/tdominit.c     \
+                  generic/tclexpat.c     \
+                  generic/tdomStubInit.c
 
-tdomstub_SOURCES= tdomStubLib.c
-tdom_SOURCES    = $(TDOM_SOURCES) $(EXPAT_SOURCES) @EXTRA_SOURCES@
+tdomstub_SOURCES= generic/tdomStubLib.c
+tdom_SOURCES    = $(TDOM_SOURCES) @EXTRA_SOURCES@
 
 WIN_SOURCES	= 
 UNIX_SOURCES    =
@@ -202,14 +202,14 @@
 
 INCLUDES	= @TDOM_INCLUDES@ @TCL_INCLUDES@ @AOL_INCLUDES@
 
-EXTRA_CFLAGS	= $(MEM_DEBUG_FLAGS) @EXTRA_CFLAGS@ -DBYTEORDER=@BYTEORDER@
+EXTRA_CFLAGS	= $(MEM_DEBUG_FLAGS) @EXTRA_CFLAGS@ @TCL_EXTRA_CFLAGS@ -DBYTEORDER=@BYTEORDER@
 
 DEFS		= $(TCL_DEFS) @DEFS@
 
 CONFIG_CLEAN_FILES = Makefile tdomConfig.sh
 
 CPPFLAGS	= @CPPFLAGS@
-LIBS		= @LIBS@
+LIBS		= -lexpat @LIBS@
 AR		= @AR@
 
 CFLAGS		= @CFLAGS_DEFAULT@ $(EXTRA_CFLAGS) $(SHLIB_CFLAGS) -DTCL_DBGX=$(TCL_DBGX)

tdom-0.8.0-tclconfig.patch:

--- NEW FILE tdom-0.8.0-tclconfig.patch ---
--- configure.orig	2006-11-25 18:43:29.000000000 -0800
+++ configure	2006-11-25 18:50:32.000000000 -0800
@@ -1120,10 +1120,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
@@ -4285,7 +4287,7 @@
 	    # results, and the version is kept in special file).
 
 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
-		system=MP-RAS-`awk '{print }' /etc/.relid'`
+		system=MP-RAS-`awk '{print }' /etc/.relid`
 	    fi
 	    if test "`uname -s`" = "AIX" ; then
 		system=AIX-`uname -v`.`uname -r`
@@ -6715,7 +6717,8 @@
 # Add some private include directories
 #--------------------------------------------------------------------
 
-TDOM_INCLUDES="-I${srcdir}/generic -I${srcdir}/expat"
+#TDOM_INCLUDES="-I${srcdir}/generic -I${srcdir}/expat"
+TDOM_INCLUDES="-I${srcdir}/generic"
 
 #--------------------------------------------------------------------
 # Add optional AOLserver includes


--- NEW FILE tdom.spec ---
Name:           tdom
Version:        0.8.0
Release:        2%{?dist}
Summary:        DOM parser for Tcl

Group:          Development/Libraries
License:        MPL
URL:            http://www.tdom.org
Source0:        http://www.tdom.org/files/tDOM-0.8.0.tar.gz
Patch0:         tdom-0.8.0-tclconfig.patch
Patch1:         tdom-0.8.0-sourcelist.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  tcl-devel expat-devel

%description
tDOM combines high performance XML data processing with easy and powerful Tcl
scripting functionality. tDOM should be one of the fastest ways to manipulate
XML with a scripting language and uses very little memory.

%prep
%setup -q -n tDOM-%{version}
%patch0
%patch1


%build
%configure --enable-threads
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT/%{_libdir}/%{name}%{version}/*.a


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README LICENSE CHANGES ChangeLog doc/*.html NPL-1_1Final.html
%{_libdir}/%{name}%{version}
%{_libdir}/%{name}Config.sh
%{_mandir}/mann/*.gz



%changelog
* Tue May 1 2007 Wart <wart at kobold.org> - 0.8.0-2
- Updated patch 1 to add $RPM_OPT_FLAGS to the compiler flags
- Add --enable-threads to match the configuration of the core Tcl package

* Sat Nov 25 2006 Wart <wart at kobold.org> - 0.8.0-1
- Initial package for Fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tdom/FC-6/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	6 May 2007 05:34:12 -0000	1.1
+++ .cvsignore	6 May 2007 22:05:33 -0000	1.2
@@ -0,0 +1 @@
+tDOM-0.8.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tdom/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 May 2007 05:34:12 -0000	1.1
+++ sources	6 May 2007 22:05:33 -0000	1.2
@@ -0,0 +1 @@
+90626edf33b7a77229a23b9132f74977  tDOM-0.8.0.tar.gz




More information about the fedora-extras-commits mailing list