rpms/itk/devel itk-3.4-libdir.patch, NONE, 1.1 itk-3.4-tclbindir.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 itk.spec, 1.9, 1.10 sources, 1.2, 1.3
Michael Thomas (wart)
fedora-extras-commits at redhat.com
Sat Jan 12 01:50:48 UTC 2008
- Previous message (by thread): rpms/wine/devel .cvsignore, 1.47, 1.48 sources, 1.48, 1.49 wine.spec, 1.71, 1.72
- Next message (by thread): rpms/wine-docs/F-7 .cvsignore, 1.36, 1.37 sources, 1.36, 1.37 wine-docs.spec, 1.36, 1.37
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: wart
Update of /cvs/extras/rpms/itk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27610
Modified Files:
.cvsignore itk.spec sources
Added Files:
itk-3.4-libdir.patch itk-3.4-tclbindir.patch
Log Message:
Update to cvs HEAD for tcl8.5 compatibility
itk-3.4-libdir.patch:
--- NEW FILE itk-3.4-libdir.patch ---
--- itk-20071231cvs/configure.in.orig 2007-05-24 15:15:41.000000000 -0700
+++ itk-20071231cvs/configure.in 2008-01-11 10:12:03.000000000 -0800
@@ -223,6 +223,39 @@
AC_SUBST(itk_LIB_FILE)
#--------------------------------------------------------------------
+# These are for itkConfig.sh
+#--------------------------------------------------------------------
+
+# pkglibdir must be a fully qualified path and (not ${exec_prefix}/lib)
+eval pkglibdir="${libdir}/${PACKAGE_NAME}${PACKAGE_VERSION}"
+if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
+ eval ITK_LIB_FLAG="-litk${PACKAGE_VERSION}${DBGX}"
+ eval ITK_STUB_LIB_FLAG="-litkstub${PACKAGE_VERSION}${DBGX}"
+else
+ eval ITK_LIB_FLAG="-litk`echo ${PACKAGE_VERSION} | tr -d .`${DBGX}"
+ eval ITK_STUB_LIB_FLAG="-litkstub`echo ${PACKAGE_VERSION} | tr -d .`${DBGX}"
+fi
+ITK_BUILD_LIB_SPEC="-L`pwd` ${itk_LIB_FLAG}"
+ITK_LIB_SPEC="-L${libdir} ${itk_LIB_FLAG}"
+
+ITK_BUILD_STUB_LIB_SPEC="-L`pwd` ${ITK_STUB_LIB_FLAG}"
+ITK_STUB_LIB_SPEC="-L${pkglibdir} ${ITK_STUB_LIB_FLAG}"
+ITK_BUILD_STUB_LIB_PATH="`pwd`/${ITK_STUB_LIB_FILE}"
+ITK_STUB_LIB_PATH="${pkglibdir}/${ITK_STUB_LIB_FILE}"
+
+AC_SUBST(ITK_BUILD_LIB_SPEC)
+AC_SUBST(ITK_LIB_SPEC)
+AC_SUBST(ITK_BUILD_STUB_LIB_SPEC)
+AC_SUBST(ITK_STUB_LIB_SPEC)
+AC_SUBST(ITK_BUILD_STUB_LIB_PATH)
+AC_SUBST(ITK_STUB_LIB_PATH)
+
+# ITK_SRC_DIR must be a fully qualified path
+eval ITK_SRC_DIR="$srcdir"
+ITK_SRC_DIR=`cd "${ITK_SRC_DIR}"; pwd`
+AC_SUBST(ITK_SRC_DIR)
+
+#--------------------------------------------------------------------
# Find tclsh so that we can run pkg_mkIndex to generate the pkgIndex.tcl
# file during the install process. Don't run the TCLSH_PROG through
# ${CYGPATH} because it's being used directly by make.
--- itk-20071231cvs/configure.orig 2008-01-10 22:57:10.000000000 -0800
+++ itk-20071231cvs/configure 2008-01-11 10:12:03.000000000 -0800
@@ -10310,6 +10310,32 @@
#--------------------------------------------------------------------
+#--------------------------------------------------------------------
+# These are for itkConfig.sh
+#--------------------------------------------------------------------
+
+# pkglibdir must be a fully qualified path and (not ${exec_prefix}/lib)
+eval pkglibdir="${libdir}/${PACKAGE_NAME}${PACKAGE_VERSION}"
+if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
+ eval ITK_LIB_FLAG="-litk${PACKAGE_VERSION}${DBGX}"
+ eval ITK_STUB_LIB_FLAG="-litkstub${PACKAGE_VERSION}${DBGX}"
+else
+ eval ITK_LIB_FLAG="-litk`echo ${PACKAGE_VERSION} | tr -d .`${DBGX}"
+ eval ITK_STUB_LIB_FLAG="-litkstub`echo ${PACKAGE_VERSION} | tr -d .`${DBGX}"
+fi
+ITK_BUILD_LIB_SPEC="-L`pwd` ${itk_LIB_FLAG}"
+ITK_LIB_SPEC="-L${libdir} ${itk_LIB_FLAG}"
+
+ITK_BUILD_STUB_LIB_SPEC="-L`pwd` ${ITK_STUB_LIB_FLAG}"
+ITK_STUB_LIB_SPEC="-L${pkglibdir} ${ITK_STUB_LIB_FLAG}"
+ITK_BUILD_STUB_LIB_PATH="`pwd`/${ITK_STUB_LIB_FILE}"
+ITK_STUB_LIB_PATH="${pkglibdir}/${ITK_STUB_LIB_FILE}"
+
+
+# ITK_SRC_DIR must be a fully qualified path
+eval ITK_SRC_DIR="$srcdir"
+ITK_SRC_DIR=`cd "${ITK_SRC_DIR}"; pwd`
+
#--------------------------------------------------------------------
@@ -11075,6 +11101,13 @@
s, at TK_STUB_LIB_SPEC@,$TK_STUB_LIB_SPEC,;t t
s, at TK_LIBS@,$TK_LIBS,;t t
s, at TK_XINCLUDES@,$TK_XINCLUDES,;t t
+s, at ITK_BUILD_LIB_SPEC@,$ITK_BUILD_LIB_SPEC,;t t
+s, at ITK_LIB_SPEC@,$ITK_LIB_SPEC,;t t
+s, at ITK_BUILD_STUB_LIB_SPEC@,$ITK_BUILD_STUB_LIB_SPEC,;t t
+s, at ITK_STUB_LIB_SPEC@,$ITK_STUB_LIB_SPEC,;t t
+s, at ITK_BUILD_STUB_LIB_PATH@,$ITK_BUILD_STUB_LIB_PATH,;t t
+s, at ITK_STUB_LIB_PATH@,$ITK_STUB_LIB_PATH,;t t
+s, at ITK_SRC_DIR@,$ITK_SRC_DIR,;t t
s, at itcl_VERSION@,$itcl_VERSION,;t t
s, at itcl_BIN_DIR@,$itcl_BIN_DIR,;t t
s, at itcl_SRC_DIR@,$itcl_SRC_DIR,;t t
--- itk-20071231cvs/Makefile.in.orig 2007-07-03 13:47:56.000000000 -0700
+++ itk-20071231cvs/Makefile.in 2008-01-11 10:12:23.000000000 -0800
@@ -95,8 +95,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 = .
@@ -367,13 +367,15 @@
@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 " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libdir)/$$p"; \
+ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libdir)/$$p; \
echo " $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p"; \
$(RANLIB) $(DESTDIR)$(pkglibdir)/$$p; \
fi; \
--- itk-20071231cvs/pkgIndex.tcl.in.orig 2004-08-10 13:58:44.000000000 -0700
+++ itk-20071231cvs/pkgIndex.tcl.in 2008-01-11 16:38:10.000000000 -0800
@@ -1,3 +1,4 @@
# Tcl package index file, version 1.0
-package ifneeded Itk @PACKAGE_VERSION@ [list load [file join $dir "@PKG_LIB_FILE@"] Itk]
+namespace eval ::itk "variable library $dir"
+package ifneeded Itk @PACKAGE_VERSION@ [list load [file join $dir .. .. "@PKG_LIB_FILE@"] Itk]
itk-3.4-tclbindir.patch:
--- NEW FILE itk-3.4-tclbindir.patch ---
--- itk-20071231cvs/configure.orig 2008-01-10 22:56:38.000000000 -0800
+++ itk-20071231cvs/configure 2008-01-10 22:57:10.000000000 -0800
@@ -10346,6 +10346,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/itk/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 22 Feb 2006 05:51:13 -0000 1.2
+++ .cvsignore 12 Jan 2008 01:50:08 -0000 1.3
@@ -1 +1 @@
-itk3.3.tar.gz
+itk-20071231cvs.tgz
Index: itk.spec
===================================================================
RCS file: /cvs/extras/rpms/itk/devel/itk.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- itk.spec 20 Dec 2007 02:08:51 -0000 1.9
+++ itk.spec 12 Jan 2008 01:50:08 -0000 1.10
@@ -1,17 +1,22 @@
+%{!?tcl_version: %define tcl_version %(echo 'puts $tcl_version' | tclsh)}
+%{!?tcl_sitearch: %define tcl_sitearch %{_libdir}/tcl%{tcl_version}}
+
Name: itk
-Version: 3.3
-Release: 0.8.RC1%{?dist}
+Version: 3.4
+Release: 1%{?dist}
Summary: Object oriented extensions to Tk
Group: Development/Libraries
License: TCL
URL: http://incrtcl.sourceforge.net/itcl/
-Source0: http://downloads.sourceforge.net/sourceforge/incrtcl/itk3.3.tar.gz
-Patch0: itk-3.3-autotools.patch
-Patch1: itk-3.3-libdir.patch
+# cvs -d:pserver:anonymous at incrtcl.cvs.sourceforge.net:/cvsroot/incrtcl export -D 2007-12-31 -d itk-20071231cvs itk
+# tar czf itk-20071231cvs.tgz ./itk-20071231cvs
+Source0: itk-20071231cvs.tgz
+Patch0: itk-3.4-libdir.patch
+Patch1: itk-3.4-tclbindir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: itcl tk
+Requires: tcl(abi) = 8.5 itcl tk
BuildRequires: tk-devel itcl-devel
%description
@@ -27,7 +32,7 @@
Development headers and libraries for linking against itk.
%prep
-%setup -q -n itk3.3
+%setup -q -n itk-20071231cvs
%patch0 -p1
%patch1 -p1
@@ -46,12 +51,12 @@
%files
%defattr(-,root,root,-)
%{_libdir}/*.so
-%dir %{_libdir}/itk3.3
-%{_libdir}/itk3.3/*.tcl
-%{_libdir}/itk3.3/*.itk
-%{_libdir}/itk3.3/tclIndex
+%dir %{tcl_sitearch}/itk%{version}
+%{tcl_sitearch}/%{name}%{version}/*.tcl
+%{tcl_sitearch}/%{name}%{version}/*.itk
+%{tcl_sitearch}/%{name}%{version}/tclIndex
%{_mandir}/mann/*.gz
-%doc README license.terms
+%doc license.terms
%files devel
%defattr(-,root,root,-)
@@ -59,6 +64,9 @@
# What happened to itk's stub library and itkConfig.sh?
%changelog
+* Fri Jan 11 2008 Wart <wart at kobold.org> - 3.4-1
+- Update to latest CVS head for tcl 8.5 compatibility
+
* Wed Dec 19 2007 Wart <wart at kobold.org> - 3.3-0.8.RC1
- Move libitk shared library to %%{_libdir} so that applications
linked against itk can find it. (BZ #372791)
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/itk/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 22 Feb 2006 05:51:13 -0000 1.2
+++ sources 12 Jan 2008 01:50:08 -0000 1.3
@@ -1 +1 @@
-a97c17f3cfa5e377f43073c653c501b5 itk3.3.tar.gz
+1c15dafe766ff5db1e8fd9f7ec473b3c itk-20071231cvs.tgz
- Previous message (by thread): rpms/wine/devel .cvsignore, 1.47, 1.48 sources, 1.48, 1.49 wine.spec, 1.71, 1.72
- Next message (by thread): rpms/wine-docs/F-7 .cvsignore, 1.36, 1.37 sources, 1.36, 1.37 wine-docs.spec, 1.36, 1.37
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list