rpms/tcldom/EL-5 tcldom.spec,1.7,1.8

Michael Thomas (wart) fedora-extras-commits at redhat.com
Sat Jun 28 21:53:05 UTC 2008


Author: wart

Update of /cvs/extras/rpms/tcldom/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24820

Modified Files:
	tcldom.spec 
Log Message:
Rebase to EL-4




Index: tcldom.spec
===================================================================
RCS file: /cvs/extras/rpms/tcldom/EL-5/tcldom.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- tcldom.spec	14 Apr 2007 22:59:10 -0000	1.7
+++ tcldom.spec	28 Jun 2008 21:52:10 -0000	1.8
@@ -1,15 +1,21 @@
+%{!?tcl_version: %define tcl_version %(echo 'puts $tcl_version' | tclsh)}
+%{!?tcl_sitelib: %define tcl_sitelib %{_datadir}/tcl%{tcl_version}}
+
 Summary: TclDOM is a package that provides a DOM binding for the Tcl scripting language
 Name: tcldom
 Version: 3.1
-Release: 7%{?dist}
+Release: 11%{?dist}
 License: BSD
 Group: Development/Libraries
-URL:    http://tclxml.sourceforge.net/
-Source: http://dl.sf.net/tclxml/tcldom-3.1.tar.gz
+URL:   http://tclxml.sourceforge.net/
+Source0: http://dl.sf.net/tclxml/tcldom-3.1.tar.gz
+Source1: pkgIndex.tcl.in.gui
 Patch0: tcldom.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: tcl-devel libxml2-devel tclxml-devel
-Requires: tcl tclxml tcllib libxml2
+Patch1: tcldom-3.1-pkgprovides.patch
+Patch2: tcldom-3.1-cversion.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: tcl-devel libxml2-devel tclxml-devel expat-devel
+Requires: tcl tclxml tcllib
 
 %description
 This package provides a DOM binding for Tcl.  It provides one of the following
@@ -19,6 +25,14 @@
           (also fast and compatiable with TclXSLT/libxslt
           [http://tclxml.sourceforge.net/tclxslt.html]).
 
+%package expat
+Summary: The Tcl dom parser built with the expat xml parser
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release} tclxml-expat
+%description expat
+This package provides an optimized Tcl dom parser built with the expat
+xml parser.
+
 %package libxml2
 Summary: The Tcl dom parser built with the libxml2 xml parser
 Group: Development/Libraries
@@ -27,6 +41,13 @@
 This package provides an optimized Tcl dom parser built with the libxml2
 xml parser.
 
+%package gui
+Summary: UI widgets for manipulating a DOM tree
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release} bwidget
+%description gui
+This package provides some useful widgets for manipulating a DOM tree.
+
 %package devel
 Summary: The Tcl dom parser development files
 Group: Development/Libraries
@@ -38,40 +59,77 @@
 
 %prep
 %setup -q
+touch -r src/configure.in src/configure.in.stamp
+touch -r src-libxml2/configure.in src-libxml2/configure.in.stamp
 %patch0 -p1
+%patch1
+%patch2
+touch -r src/configure.in.stamp src/configure.in
+touch -r src-libxml2/configure.in.stamp src-libxml2/configure.in
 %{__sed} -i 's/\r//' examples/tkxmllint.tcl
 
 %build
-cd src-libxml2
-%configure
+pushd src
+%configure --enable-threads
+make %{?_smp_mflags}
+popd
+pushd src-libxml2
+%configure --enable-threads
 make %{?_smp_mflags}
+popd
 
 %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
+mkdir -p $RPM_BUILD_ROOT/%{tcl_sitelib}/%{name}%{version}
+install -m 0644 library/*.tcl $RPM_BUILD_ROOT/%{tcl_sitelib}/%{name}%{version}
+sed -e 's/@VERSION@/%{version}/' < library/pkgIndex.tcl.in > $RPM_BUILD_ROOT/%{tcl_sitelib}/%{name}%{version}/pkgIndex.tcl
+
+pushd src-libxml2
+make install DESTDIR=$RPM_BUILD_ROOT
+popd
 
-cd src-libxml2
+pushd src
 make install DESTDIR=$RPM_BUILD_ROOT
+mv $RPM_BUILD_ROOT%{_libdir}/tcldom3.1 $RPM_BUILD_ROOT%{_libdir}/%{name}_expat%{version}
+popd
+
+# Install the examples in a -gui subpackage
+install -d $RPM_BUILD_ROOT%{tcl_sitelib}/%{name}-gui%{version}
+sed -e 's/@VERSION@/%{version}/' < %{SOURCE1} > $RPM_BUILD_ROOT/%{tcl_sitelib}/%{name}-gui%{version}/pkgIndex.tcl
+install -p -m 0644 examples/domtree.tcl \
+        examples/domtree-treectrl.tcl \
+        examples/domtext.tcl \
+        examples/cgi2dom.tcl \
+        $RPM_BUILD_ROOT%{tcl_sitelib}/%{name}-gui%{version}/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%{_datadir}/%{name}%{version}
+%{tcl_sitelib}/%{name}%{version}
 %doc ChangeLog README MANIFEST RELNOTES LICENSE
 %doc docs/* examples/*
 
+%files expat
+%defattr(-,root,root)
+%dir %{_libdir}/%{name}_expat%{version}
+%{_libdir}/%{name}_expat%{version}/*.tcl
+%{_libdir}/%{name}_expat%{version}/*.so
+
 %files libxml2
 %defattr(-,root,root)
 %dir %{_libdir}/%{name}_libxml2%{version}
 %{_libdir}/%{name}_libxml2%{version}/*.tcl
 %{_libdir}/%{name}_libxml2%{version}/*.so
 
+%files gui
+%defattr(-,root,root)
+%dir %{tcl_sitelib}/%{name}-gui%{version}
+%{tcl_sitelib}/%{name}-gui%{version}/*.tcl
+
 %files devel
 %defattr(-,root,root)
 %{_includedir}/*
@@ -79,9 +137,22 @@
 %{_libdir}/%{name}_libxml2%{version}/*.a
 
 %changelog
-* Fri Apr 13 2007 Wart <wart at kobold.org> - 3.1-7
+* Sat Jun 28 2008 Wart <wart at kobold.org> - 3.1-11
+- Fix tcl requirement for epel5
+
+* Fri Apr 13 2007 Wart <wart at kobold.org> - 3.1-10
 - Fix BuildRequires: for directory ownership in -devel subpackage
 
+* Fri Feb 16 2007 Wart <wart at kobold.org> - 3.1-9
+- Rebuild for reversion to tcl8.4
+
+* Thu Feb 8 2007 Wart <wart at kobold.org> - 3.1-8
+- Add missing BuildRequires: tcl
+
+* Thu Feb 8 2007 Wart <wart at kobold.org> - 3.1-7
+- Add a -gui subpackage for the dom-based widgets
+- Add a -expat subpackage for the expat-based dom parser
+
 * Mon Aug 28 2006 Wart <wart at kobold.org> - 3.1-6
 - Rebuild for Fedora Extras
 




More information about the fedora-extras-commits mailing list