rpms/tcl/devel tcl-8.4.13-html.patch, NONE, 1.1 .cvsignore, 1.16, 1.17 sources, 1.17, 1.18 tcl.spec, 1.45, 1.46
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Feb 13 14:17:01 UTC 2007
Author: mmaslano
Update of /cvs/dist/rpms/tcl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5669
Modified Files:
.cvsignore sources tcl.spec
Added Files:
tcl-8.4.13-html.patch
Log Message:
Change for review.
tcl-8.4.13-html.patch:
Makefile.in | 39 ---------------------------------------
1 files changed, 39 deletions(-)
--- NEW FILE tcl-8.4.13-html.patch ---
--- tcl8.4.13/unix/Makefile.in.html 2007-02-13 13:04:29.000000000 +0100
+++ tcl8.4.13/unix/Makefile.in 2007-02-13 13:10:47.000000000 +0100
@@ -78,12 +78,6 @@
# Tcl commands:
MANN_INSTALL_DIR = $(MAN_INSTALL_DIR)/mann
-# Path to the html documentation dir:
-HTML_DIR = @HTML_DIR@
-
-# Directory in which to install html documentation:
-HTML_INSTALL_DIR = $(INSTALL_ROOT)$(HTML_DIR)
-
# Package search path.
TCL_PACKAGE_PATH = @TCL_PACKAGE_PATH@
@@ -1318,7 +1312,6 @@
$(DISTDIR)/mac
cp -p $(TOP_DIR)/mac/porting.notes $(TOP_DIR)/mac/README $(DISTDIR)/mac
cp -p $(TOP_DIR)/mac/*.pch $(DISTDIR)/mac
- cp -p $(TOP_DIR)/mac/*.doc $(TOP_DIR)/mac/*.html $(DISTDIR)/mac
cp -p $(TOP_DIR)/license.terms $(DISTDIR)/mac
mkdir $(DISTDIR)/macosx
cp -p $(TOP_DIR)/macosx/Makefile $(TOP_DIR)/macosx/README \
@@ -1368,44 +1361,12 @@
mv $(DISTROOT)/old $(DISTROOT)/tcl${VERSION}
#
-# This target creates the HTML folder for Tcl & Tk and places it
-# in DISTDIR/html. It uses the tcltk-man2html.tcl tool from
-# the Tcl group's tool workspace. It depends on the Tcl & Tk being
-# in directories called tcl8.* & tk8.* up two directories from the
-# TOOL_DIR.
-#
-
-html:
- $(BUILD_HTML)
- @EXTRA_BUILD_HTML@
-html-tcl:
- $(BUILD_HTML) --tcl
- @EXTRA_BUILD_HTML@
-html-tk:
- $(BUILD_HTML) --tk
- @EXTRA_BUILD_HTML@
-
-BUILD_HTML = \
- @@LD_LIBRARY_PATH_VAR@=`pwd`:$${@LD_LIBRARY_PATH_VAR@}; export @LD_LIBRARY_PATH_VAR@; \
- TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \
- ./tclsh $(TOOL_DIR)/tcltk-man2html.tcl --htmldir=$(HTML_INSTALL_DIR) \
- --srcdir=$(TOP_DIR)/.. $(BUILD_HTML_FLAGS)
-
-#
# Target to create a Macintosh version of the distribution. This will
# do a normal distribution and then massage the output to prepare it
# for moving to the Mac platform. This requires a few scripts and
# programs found only in the Tcl group's tool workspace.
#
-macdist: dist machtml
-
-machtml:
- rm -f $(DISTDIR)/mac/tclMacProjects.sea.hqx
- rm -rf $(DISTDIR)/doc
- $(TCL_EXE) $(TOOL_DIR)/cvtEOL.tcl $(DISTDIR)
-
-#
# Targets to build Solaris package of the distribution for the current
# architecture. To build stream packages for both sun4 and i86pc
# architectures:
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/tcl/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore 9 Feb 2007 15:06:32 -0000 1.16
+++ .cvsignore 13 Feb 2007 14:16:58 -0000 1.17
@@ -1,2 +1,2 @@
tcl8.4.13-src.tar.gz
-tk8.4.13-src.tar.gz
+tcl8.4.13-html.tar.gz
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/tcl/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources 9 Feb 2007 15:06:32 -0000 1.17
+++ sources 13 Feb 2007 14:16:58 -0000 1.18
@@ -1,2 +1,2 @@
-f3420b9439bcc769992c1367934a060d tcl8.4.13-src.tar.gz
-0a16d4d9398e43cbb85784c85fb807a4 tk8.4.13-src.tar.gz
+a4f80c2e262f4270daa2db61cb49c96d tcl8.4.13-html.tar.gz
+3010a43faa30e5a5d69cbb5e8ab67e37 tcl8.4.13-src.tar.gz
Index: tcl.spec
===================================================================
RCS file: /cvs/dist/rpms/tcl/devel/tcl.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- tcl.spec 9 Feb 2007 22:26:49 -0000 1.45
+++ tcl.spec 13 Feb 2007 14:16:58 -0000 1.46
@@ -4,21 +4,22 @@
Summary: Tcl scripting language development environment
Name: tcl
Version: %{majorver}.13
-Release: 8%{?dist}
+Release: 9%{?dist}
Epoch: %{epoch}
License: BSD
Group: Development/Languages
URL: http://tcl.sourceforge.net/
Source0: http://puzzle.dl.sourceforge.net/sourceforge/tcl/tcl%{version}-src.tar.gz
-Source1: http://switch.dl.sourceforge.net/sourceforge/tcl/tk%{version}-src.tar.gz
+Source1: http://superb-east.dl.sourceforge.net/sourceforge/tcl/tcl8.4.13-html.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Buildrequires: autoconf, sed, man
+Buildrequires: autoconf
##Conflicts: tcldict
Patch1: tcl-8.3.5-tclm4-soname.patch
Patch2: tcl-8.4.5-lib-perm.patch
Patch3: tcl8.3.5-tclConfig-package-path-90160.patch
Patch4: tcl-8.4-no_rpath.patch
Patch5: tcl-8.4.13-autoconf.patch
+Patch6: tcl-8.4.13-html.patch
#Patch6: tcl-8.4.13-cflags.patch
#Patch7: tcl-8.5a5-makefile.patch
#Patch8: tcl-8.5a5-stackchk.patch
@@ -34,10 +35,8 @@
applications.
%package devel
-Version: %{version}
Summary: Tcl scripting language development environment
Group: Development/Languages
-URL: http://tcl.sourceforge.net/
Requires: %{name} = %{epoch}:%{version}-%{release}
%description devel
@@ -52,10 +51,9 @@
The package contains the development files and man pages for tcl.
%package html
-Version: %{version}
Summary: Tcl/Tk manual in html format
Group: Development/Libraries
-URL: http://tcl.sourceforge.net/
+URL: http://superb-east.dl.sourceforge.net/sourceforge/tcl/tcl8.4.13-html.tar.gz
%description html
Tcl/Tk is a powerful scripting language and GUI toolkit.
@@ -73,9 +71,10 @@
%patch3 -p1 -b .3-pkgpath
%patch4 -p1 -b .4-rpath
%patch5 -p1 -b .5-ac213
-pushd ..
+%patch6 -p1 -b .6-html
+#pushd ..
#%patch6 -p1 -b .6-cflags
-popd
+#popd
#%patch7 -p2 -b .7-makefile
#%patch8 -p1 -b .8-stackchk
#%patch9 -p1 -b .9-http
@@ -104,7 +103,7 @@
make install -C unix INSTALL_ROOT=%{buildroot} TCL_LIBRARY=%{_datadir}/%{name}%{majorver}
# generate HTML doc set, run from unix, makefile
-make -C unix html HTML_DIR=`pwd`/html
+#make -C unix html HTML_DIR=`pwd`/html
ln -s tclsh%{majorver} %{buildroot}%{_bindir}/tclsh
@@ -115,7 +114,8 @@
# to prefix/lib/%{name}%{majorver}
## make /usr/lib for multilib archs
mkdir -p %{buildroot}%{_prefix}/%{_lib}
-ln -s %{_datadir}/%{name}%{majorver} %{buildroot}%{_prefix}/%{_lib}/%{name}%{majorver}
+#ln -s %{_datadir}/%{name}%{majorver} %buildroot/%{_prefix}/%{_lib}/%{name}%{majorver}
+ln -s ./%{name}%{majorver} %buildroot/%{_prefix}/%{_lib}/%{name}%{majorver}
mkdir -p %buildroot/%{_includedir}/%{name}-private/{generic,unix}
find generic unix -name "*.h" -exec cp -p '{}' %buildroot/%{_includedir}/%{name}-private/'{}' ';'
@@ -148,13 +148,12 @@
%{_datadir}/%{name}%{majorver}/tcltest2.2/*
%{_datadir}/%{name}%{majorver}/*.tcl
%{_datadir}/%{name}%{majorver}/tclIndex
-%{_bindir}/ldAix
+%attr(755,root,root) %{_bindir}/ldAix
%{_libdir}/lib%{name}%{majorver}.so
%{_mandir}/man1/*
# this should be prefix/lib
%{_prefix}/%{_lib}/%{name}%{majorver}
-%doc %{name}%{version}/README %{name}%{version}/changes
-%doc %{name}%{version}/license.terms
+%doc %{name}%{version}/README %{name}%{version}/changes %{name}%{version}/license.terms
%files devel
%defattr(-,root,root)
@@ -170,6 +169,9 @@
%doc %{name}%{version}/html/*
%changelog
+* Tue Feb 13 2007 Marcela Maslanova <mmaslano at redhat.com> - 1:8.4.13-9
+- review again
+
* Fri Feb 09 2007 David Cantrell <dcantrell at redhat.com> - 1:8.4.13-8
- rebuild
More information about the fedora-cvs-commits
mailing list