rpms/tdom/devel tdom-0.8.2-noexpat.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 tdom.spec, 1.1, 1.2 tdom-0.8.0-sourcelist.patch, 1.1, NONE tdom-0.8.0-tclconfig.patch, 1.1, NONE

Michael Thomas (wart) fedora-extras-commits at redhat.com
Mon Aug 27 01:21:51 UTC 2007


Author: wart

Update of /cvs/pkgs/rpms/tdom/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6852

Modified Files:
	.cvsignore sources tdom.spec 
Added Files:
	tdom-0.8.2-noexpat.patch 
Removed Files:
	tdom-0.8.0-sourcelist.patch tdom-0.8.0-tclconfig.patch 
Log Message:
- Update to 0.8.2
- Split into base and -devel packages
- License tag clarification



tdom-0.8.2-noexpat.patch:

--- NEW FILE tdom-0.8.2-noexpat.patch ---
--- tDOM-0.8.2/configure.orig	2007-08-26 15:56:58.000000000 -0700
+++ tDOM-0.8.2/configure	2007-08-26 15:57:52.000000000 -0700
@@ -6298,10 +6298,7 @@
 #-----------------------------------------------------------------------
 
 
-    vars="expat/xmlrole.c     \
-                 expat/xmltok.c      \
-                 expat/xmlparse.c    \
-                 generic/xmlsimple.c \
+    vars="generic/xmlsimple.c \
                  generic/utf8conv.c  \
                  generic/dom.c       \
                  generic/domalloc.c  \
@@ -6360,7 +6357,7 @@
 
 
 
-    vars="-I${srcdir}/generic -I${srcdir}/expat ${AOL_INCLUDES}"
+    vars="-I${srcdir}/generic ${AOL_INCLUDES}"
     for i in $vars; do
 	PKG_INCLUDES="$PKG_INCLUDES $i"
     done
--- tDOM-0.8.2/configure.in.orig	2007-08-26 15:56:27.000000000 -0700
+++ tDOM-0.8.2/configure.in	2007-08-26 15:56:51.000000000 -0700
@@ -83,10 +83,7 @@
 # and PKG_TCL_SOURCES.
 #-----------------------------------------------------------------------
 
-TEA_ADD_SOURCES([expat/xmlrole.c     \
-                 expat/xmltok.c      \
-                 expat/xmlparse.c    \
-                 generic/xmlsimple.c \
+TEA_ADD_SOURCES([generic/xmlsimple.c \
                  generic/utf8conv.c  \
                  generic/dom.c       \
                  generic/domalloc.c  \
@@ -100,7 +97,7 @@
                  generic/tclexpat.c  \
                  generic/tdomStubInit.c])
 TEA_ADD_HEADERS([generic/tdom.h])
-TEA_ADD_INCLUDES([-I${srcdir}/generic -I${srcdir}/expat ${AOL_INCLUDES}])
+TEA_ADD_INCLUDES([-I${srcdir}/generic ${AOL_INCLUDES}])
 TEA_ADD_LIBS([${AOL_LIBS}])
 TEA_ADD_CFLAGS([])
 TEA_ADD_STUB_SOURCES([generic/tdomStubLib.c])
--- tDOM-0.8.2/Makefile.in.orig	2007-08-26 15:57:05.000000000 -0700
+++ tDOM-0.8.2/Makefile.in	2007-08-26 15:57:28.000000000 -0700
@@ -296,7 +296,7 @@
 # As necessary, add $(srcdir):$(srcdir)/compat:....
 #========================================================================
 
-VPATH = $(srcdir):$(srcdir)/expat:$(srcdir)/generic:$(srcdir)/unix:$(srcdir)/win
+VPATH = $(srcdir):$(srcdir)/generic:$(srcdir)/unix:$(srcdir)/win
 
 .c. at OBJEXT@:
 	$(COMPILE) -c `@CYGPATH@ $<` -o $@


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tdom/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 May 2007 21:52:08 -0000	1.2
+++ .cvsignore	27 Aug 2007 01:21:19 -0000	1.3
@@ -1 +1 @@
-tDOM-0.8.0.tar.gz
+tDOM-0.8.2.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tdom/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 May 2007 21:52:08 -0000	1.2
+++ sources	27 Aug 2007 01:21:19 -0000	1.3
@@ -1 +1 @@
-90626edf33b7a77229a23b9132f74977  tDOM-0.8.0.tar.gz
+67790846eb5ec13852a3bf3c382d86dc  tDOM-0.8.2.tgz


Index: tdom.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tdom/devel/tdom.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tdom.spec	6 May 2007 21:52:08 -0000	1.1
+++ tdom.spec	27 Aug 2007 01:21:19 -0000	1.2
@@ -1,14 +1,15 @@
 Name:           tdom
-Version:        0.8.0
-Release:        2%{?dist}
+Version:        0.8.2
+Release:        1%{?dist}
 Summary:        DOM parser for Tcl
 
 Group:          Development/Libraries
-License:        MPL
+# Most files MPL except for ./generic/xmlsimple.c and ./generic/domhtml.c
+# which are LGPLV2+.
+License:        LGPLv2+
 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
+Source0:        http://www.tdom.org/files/tDOM-%{version}.tgz
+Patch0:         tdom-0.8.2-noexpat.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  tcl-devel expat-devel
@@ -18,10 +19,16 @@
 scripting functionality. tDOM should be one of the fastest ways to manipulate
 XML with a scripting language and uses very little memory.
 
+%package devel
+Summary: Development files for compiling against tdom
+Group: Development/Libraries
+Requires:       %{name} = %{version}-%{release} expat-devel
+%description devel
+Development header files for compiling against tdom.
+
 %prep
 %setup -q -n tDOM-%{version}
-%patch0
-%patch1
+%patch0 -p1
 
 
 %build
@@ -32,7 +39,6 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT/%{_libdir}/%{name}%{version}/*.a
 
 
 %clean
@@ -43,12 +49,25 @@
 %defattr(-,root,root,-)
 %doc README LICENSE CHANGES ChangeLog doc/*.html NPL-1_1Final.html
 %{_libdir}/%{name}%{version}
-%{_libdir}/%{name}Config.sh
+%exclude %{_libdir}/%{name}%{version}/*.a
 %{_mandir}/mann/*.gz
 
+%files devel
+%defattr(-,root,root,-)
+%{_libdir}/%{name}Config.sh
+# This static library is a 'stub' library that is used to assist with
+# shared lib linking across library versions:  http://wiki.tcl.tk/285
+%{_libdir}/%{name}%{version}/*.a
+%{_includedir}/*.h
+
 
 
 %changelog
+* Sun Aug 26 2007 Wart <wart at kobold.org> - 0.8.2-1
+- Update to 0.8.2
+- Split into base and -devel packages
+- License tag clarification
+
 * 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


--- tdom-0.8.0-sourcelist.patch DELETED ---


--- tdom-0.8.0-tclconfig.patch DELETED ---




More information about the fedora-extras-commits mailing list