rpms/itk/devel itk-3.3-libdir.patch,NONE,1.1 itk.spec,1.8,1.9
Michael Thomas (wart)
fedora-extras-commits at redhat.com
Thu Dec 20 02:09:26 UTC 2007
Author: wart
Update of /cvs/extras/rpms/itk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31695
Modified Files:
itk.spec
Added Files:
itk-3.3-libdir.patch
Log Message:
Move libitk shared library to %%{_libdir} so that applications linked against itk can find it. (BZ #372791)
itk-3.3-libdir.patch:
--- NEW FILE itk-3.3-libdir.patch ---
--- itk3.3/configure.in.orig 2007-12-19 17:28:55.000000000 -0800
+++ itk3.3/configure.in 2007-12-19 17:34:21.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.
--- itk3.3/configure.orig 2007-12-19 17:28:52.000000000 -0800
+++ itk3.3/configure 2007-12-19 17:41:28.000000000 -0800
@@ -10227,6 +10227,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`
+
#--------------------------------------------------------------------
@@ -11006,6 +11032,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
--- itk3.3/Makefile.in.orig 2007-12-19 17:29:14.000000000 -0800
+++ itk3.3/Makefile.in 2007-12-19 17:34:44.000000000 -0800
@@ -366,13 +366,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; \
--- itk3.3/pkgIndex.tcl.in.orig 2007-12-19 17:29:10.000000000 -0800
+++ itk3.3/pkgIndex.tcl.in 2007-12-19 17:30:35.000000000 -0800
@@ -1,3 +1,3 @@
# Tcl package index file, version 1.0
-package ifneeded Itk @PACKAGE_VERSION@ [list load [file join $dir "@PKG_LIB_FILE@"] Itk]
+package ifneeded Itk @PACKAGE_VERSION@ [list load [file join $dir .. "@PKG_LIB_FILE@"] Itk]
Index: itk.spec
===================================================================
RCS file: /cvs/extras/rpms/itk/devel/itk.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- itk.spec 20 Aug 2007 00:16:26 -0000 1.8
+++ itk.spec 20 Dec 2007 02:08:51 -0000 1.9
@@ -1,6 +1,6 @@
Name: itk
Version: 3.3
-Release: 0.7.RC1%{?dist}
+Release: 0.8.RC1%{?dist}
Summary: Object oriented extensions to Tk
Group: Development/Libraries
@@ -8,6 +8,7 @@
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
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: itcl tk
@@ -27,7 +28,8 @@
%prep
%setup -q -n itk3.3
-%patch -p1
+%patch0 -p1
+%patch1 -p1
%build
%configure
@@ -43,17 +45,24 @@
%files
%defattr(-,root,root,-)
+%{_libdir}/*.so
%dir %{_libdir}/itk3.3
-%{_libdir}/itk3.3
+%{_libdir}/itk3.3/*.tcl
+%{_libdir}/itk3.3/*.itk
+%{_libdir}/itk3.3/tclIndex
%{_mandir}/mann/*.gz
%doc README license.terms
%files devel
%defattr(-,root,root,-)
%{_includedir}/*.h
-%doc
+# What happened to itk's stub library and itkConfig.sh?
%changelog
+* 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)
+
* Sun Aug 19 2007 Wart <wart at kobold.org> - 3.3-0.7.RC1
- License tag clarification
- Better download URL
More information about the fedora-extras-commits
mailing list