rpms/itcl/devel itcl-3.4-libdir.patch, NONE, 1.1 itcl-3.4-tclbindir.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 itcl.spec, 1.9, 1.10 sources, 1.2, 1.3
Michael Thomas (wart)
fedora-extras-commits at redhat.com
Fri Jan 11 23:00:56 UTC 2008
Author: wart
Update of /cvs/extras/rpms/itcl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28957
Modified Files:
.cvsignore itcl.spec sources
Added Files:
itcl-3.4-libdir.patch itcl-3.4-tclbindir.patch
Log Message:
Update to itcl-3.4 based on cvs HEAD.
itcl-3.4-libdir.patch:
--- NEW FILE itcl-3.4-libdir.patch ---
--- incrtcl-20071231cvs/configure.in.orig 2007-05-24 15:15:40.000000000 -0700
+++ incrtcl-20071231cvs/configure.in 2008-01-11 09:29:59.000000000 -0800
@@ -221,7 +221,7 @@
eval itcl_STUB_LIB_FLAG="-litclstub`echo ${PACKAGE_VERSION} | tr -d .`${DBGX}"
fi
itcl_BUILD_LIB_SPEC="-L`pwd` ${itcl_LIB_FLAG}"
-itcl_LIB_SPEC="-L${pkglibdir} ${itcl_LIB_FLAG}"
+itcl_LIB_SPEC="-L${libdir} ${itcl_LIB_FLAG}"
itcl_BUILD_STUB_LIB_SPEC="-L`pwd` ${itcl_STUB_LIB_FLAG}"
itcl_STUB_LIB_SPEC="-L${pkglibdir} ${itcl_STUB_LIB_FLAG}"
--- incrtcl-20071231cvs/configure.orig 2008-01-10 19:42:49.000000000 -0800
+++ incrtcl-20071231cvs/configure 2008-01-11 09:29:59.000000000 -0800
@@ -9495,7 +9495,7 @@
eval itcl_STUB_LIB_FLAG="-litclstub`echo ${PACKAGE_VERSION} | tr -d .`${DBGX}"
fi
itcl_BUILD_LIB_SPEC="-L`pwd` ${itcl_LIB_FLAG}"
-itcl_LIB_SPEC="-L${pkglibdir} ${itcl_LIB_FLAG}"
+itcl_LIB_SPEC="-L${libdir} ${itcl_LIB_FLAG}"
itcl_BUILD_STUB_LIB_SPEC="-L`pwd` ${itcl_STUB_LIB_FLAG}"
itcl_STUB_LIB_SPEC="-L${pkglibdir} ${itcl_STUB_LIB_FLAG}"
--- incrtcl-20071231cvs/Makefile.in.orig 2007-07-03 16:45:44.000000000 -0700
+++ incrtcl-20071231cvs/Makefile.in 2008-01-11 09:45:52.000000000 -0800
@@ -76,8 +76,8 @@
DESTDIR =
PKG_DIR = $(PACKAGE_NAME)$(PACKAGE_VERSION)
-pkgdatadir = $(datadir)/$(PKG_DIR)
-pkglibdir = $(libdir)/$(PKG_DIR)
+pkgdatadir = $(datadir)/tcl at TCL_VERSION@/$(PKG_DIR)
+pkglibdir = $(libdir)/tcl at TCL_VERSION@/$(PKG_DIR)
pkgincludedir = $(includedir)/$(PKG_DIR)
top_builddir = .
@@ -342,15 +342,17 @@
@mkdir -p $(DESTDIR)$(pkglibdir)
@list='$(lib_BINARIES)'; for p in $$list; do \
if test -f $$p; then \
- echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
- $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p; \
stub=`echo $$p|sed -e "s/.*\(stub\).*/\1/"`; \
if test "x$$stub" = "xstub"; then \
+ echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
+ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p; \
echo " $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p"; \
$(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p; \
else \
- echo " $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p"; \
- $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p; \
+ echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libdir)/$$p"; \
+ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libdir)/$$p; \
+ echo " $(RANLIB) $(DESTDIR)$(libdir)/$$p"; \
+ $(RANLIB) $(DESTDIR)$(libdir)/$$p; \
fi; \
ext=`echo $$p|sed -e "s/.*\.//"`; \
if test "x$$ext" = "xdll"; then \
--- incrtcl-20071231cvs/pkgIndex.tcl.in.orig 2004-08-10 13:58:44.000000000 -0700
+++ incrtcl-20071231cvs/pkgIndex.tcl.in 2008-01-11 09:29:59.000000000 -0800
@@ -1,3 +1,4 @@
# Tcl package index file, version 1.0
-package ifneeded Itcl @PACKAGE_VERSION@ [list load [file join $dir "@PKG_LIB_FILE@"] Itcl]
+namespace eval ::itcl "variable library $dir"
+package ifneeded Itcl @PACKAGE_VERSION@ [list load [file join $dir .. .. "@PKG_LIB_FILE@"] Itcl]
itcl-3.4-tclbindir.patch:
--- NEW FILE itcl-3.4-tclbindir.patch ---
--- incrtcl-20071231cvs/configure.orig 2008-01-10 19:30:38.000000000 -0800
+++ incrtcl-20071231cvs/configure 2008-01-10 19:42:49.000000000 -0800
@@ -9465,6 +9465,15 @@
break
fi
done
+ if test "x${REAL_TCL_BIN_DIR}" = "x" ; then
+ TCLSH_PROG=tclsh
+ for i in $list ; do
+ if test -f "$i/${TCLSH_PROG}" ; then
+ REAL_TCL_BIN_DIR="`cd "$i"; pwd`"
+ break
+ fi
+ done
+ fi
TCLSH_PROG="${REAL_TCL_BIN_DIR}/${TCLSH_PROG}"
fi
echo "$as_me:$LINENO: result: ${TCLSH_PROG}" >&5
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/itcl/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 4 Feb 2006 16:47:01 -0000 1.2
+++ .cvsignore 11 Jan 2008 23:00:17 -0000 1.3
@@ -1 +1 @@
-itcl3.3.tar.gz
+incrtcl-20071231cvs.tgz
Index: itcl.spec
===================================================================
RCS file: /cvs/extras/rpms/itcl/devel/itcl.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- itcl.spec 20 Dec 2007 02:06:18 -0000 1.9
+++ itcl.spec 11 Jan 2008 23:00:17 -0000 1.10
@@ -1,18 +1,22 @@
+%{!?tcl_version: %define tcl_version %(echo 'puts $tcl_version' | tclsh)}
+%{!?tcl_sitearch: %define tcl_sitearch %{_libdir}/tcl%{tcl_version}}
+
Name: itcl
-Version: 3.3
-Release: 0.11.RC1%{?dist}
+Version: 3.4
+Release: 1%{?dist}
Summary: Object oriented extensions to Tcl and Tk
Group: Development/Libraries
License: TCL
URL: http://incrtcl.sourceforge.net/itcl/
-Source0: http://downloads.sourceforge.net/incrtcl/itcl3.3.tar.gz
-Patch0: itcl-3.3-autotools.patch
-Patch1: itcl-3.3-func-leak.patch
-Patch2: itcl-3.3-libdir.patch
+# cvs -d:pserver:anonymous at incrtcl.cvs.sourceforge.net:/cvsroot/incrtcl export -D 2007-12-31 -d incrtcl-20071231cvs itcl
+# tar czf incrtcl-20071231cvs.tgz ./incrtcl-20071231cvs
+Source0: incrtcl-20071231cvs.tgz
+Patch0: itcl-3.4-tclbindir.patch
+Patch1: itcl-3.4-libdir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: tcl
+Requires: tcl(abi) = 8.5
BuildRequires: tcl-devel
%description
@@ -27,10 +31,9 @@
Development headers and libraries for linking against itcl.
%prep
-%setup -q -n itcl3.3
+%setup -q -n incrtcl-20071231cvs
%patch0 -p1
%patch1 -p1
-%patch2 -p1
%build
%configure
@@ -40,6 +43,10 @@
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
+# Patch the updated location of the stub library
+sed -i -e "s#%{_libdir}/%{name}%{version}#%{tcl_sitearch}/%{name}%{version}#" \
+ $RPM_BUILD_ROOT%{_libdir}/itclConfig.sh
+
%check
make test
@@ -49,21 +56,24 @@
%files
%defattr(-,root,root,-)
-%dir %{_libdir}/itcl3.3
+%dir %{tcl_sitearch}/%{name}%{version}
+%{tcl_sitearch}/%{name}%{version}/*.tcl
%{_libdir}/*.so
-%{_libdir}/itcl3.3/*.tcl
%{_mandir}/mann/*.gz
-%doc README license.terms
+%doc license.terms
%files devel
%defattr(-,root,root,-)
%{_includedir}/*.h
-%{_libdir}/itcl3.3/*.a
+%{tcl_sitearch}/%{name}%{version}/*.a
%{_libdir}/itclConfig.sh
%changelog
+* Thu Jan 10 2008 Wart <wart at kobold.org> - 3.4-0.1
+- Update to latest CVS head for tcl 8.5 compatibility
+
* Wed Dec 19 2007 Wart <wart at kobold.org> - 3.3-0.11.RC1
-- Move libtcl shared library to %%{_libdir} so that applications
+- Move libitcl shared library to %%{_libdir} so that applications
linked against itcl can find it. (BZ #372791)
* Sun Aug 19 2007 Wart <wart at kobold.org> - 3.3-0.10.RC1
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/itcl/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 4 Feb 2006 16:47:01 -0000 1.2
+++ sources 11 Jan 2008 23:00:17 -0000 1.3
@@ -1 +1 @@
-d958b3d1c52fa5336b5aacc1251b5ce3 itcl3.3.tar.gz
+eb86eb5a3be09e4957701f9b9d9aa635 incrtcl-20071231cvs.tgz
More information about the fedora-extras-commits
mailing list