rpms/itcl/devel itcl-3.3-libdir.patch,NONE,1.1 itcl.spec,1.8,1.9

[Michael Thomas (wart)]

Author: wart

Update of /cvs/extras/rpms/itcl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31599

Modified Files:
	itcl.spec 
Added Files:
	itcl-3.3-libdir.patch 
Log Message:
Move libtcl shared library to %%{_libdir} so that applications linked against itcl can find it. (BZ #372791)



itcl-3.3-libdir.patch:

--- NEW FILE itcl-3.3-libdir.patch ---
--- itcl3.3/configure.in.orig	2007-12-19 17:11:07.000000000 -0800
+++ itcl3.3/configure.in	2007-12-19 17:03:03.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}"
--- itcl3.3/configure.orig	2007-12-19 17:02:32.000000000 -0800
+++ itcl3.3/configure	2007-12-19 17:11:31.000000000 -0800
@@ -9483,7 +9483,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}"
--- itcl3.3/Makefile.in.orig	2007-12-19 17:05:33.000000000 -0800
+++ itcl3.3/Makefile.in	2007-12-19 17:09:55.000000000 -0800
@@ -341,15 +341,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 \
--- itcl3.3/pkgIndex.tcl.in.orig	2007-12-19 17:03:51.000000000 -0800
+++ itcl3.3/pkgIndex.tcl.in	2007-12-19 17:04:08.000000000 -0800
@@ -1,3 +1,3 @@
 # Tcl package index file, version 1.0
 
-package ifneeded Itcl @PACKAGE_VERSION@ [list load [file join $dir "@PKG_LIB_FILE@"] Itcl]
+package ifneeded Itcl @PACKAGE_VERSION@ [list load [file join $dir .. "@PKG_LIB_FILE@"] Itcl]


Index: itcl.spec
===================================================================
RCS file: /cvs/extras/rpms/itcl/devel/itcl.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- itcl.spec	19 Aug 2007 23:38:45 -0000	1.8
+++ itcl.spec	20 Dec 2007 02:06:18 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           itcl
 Version:        3.3
-Release:        0.10.RC1%{?dist}
+Release:        0.11.RC1%{?dist}
 Summary:        Object oriented extensions to Tcl and Tk
 
 Group:          Development/Libraries
@@ -9,6 +9,7 @@
 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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:  tcl
@@ -29,6 +30,7 @@
 %setup -q -n itcl3.3
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %configure
@@ -48,7 +50,7 @@
 %files
 %defattr(-,root,root,-)
 %dir %{_libdir}/itcl3.3
-%{_libdir}/itcl3.3/*.so
+%{_libdir}/*.so
 %{_libdir}/itcl3.3/*.tcl
 %{_mandir}/mann/*.gz
 %doc README license.terms
@@ -58,9 +60,12 @@
 %{_includedir}/*.h
 %{_libdir}/itcl3.3/*.a
 %{_libdir}/itclConfig.sh
-%doc
 
 %changelog
+* Wed Dec 19 2007 Wart <wart at kobold.org> - 3.3-0.11.RC1
+- Move libtcl 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
 - License tag clarification
 - Better download URL