rpms/blt/devel blt.spec,1.20,1.21 blt2.4z-destdir.patch,1.1,1.2

[Michael Thomas (wart)]

Author: wart

Update of /cvs/pkgs/rpms/blt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31446

Modified Files:
	blt.spec blt2.4z-destdir.patch 
Log Message:
Move pkgIndex.tcl file to %%{_libdir} as it contains arch-specific components




Index: blt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/blt/devel/blt.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- blt.spec	7 Jan 2008 07:10:38 -0000	1.20
+++ blt.spec	7 Jan 2008 23:02:25 -0000	1.21
@@ -5,7 +5,7 @@
 Summary: BLT widget extension to Tcl/Tk scripting language development
 Name: blt
 Version: 2.4
-Release: 23%{?dist}
+Release: 24%{?dist}
 
 License: MIT
 Group: Development/Libraries
@@ -91,6 +91,7 @@
 %doc README INSTALL PROBLEMS html/
 %{_libdir}/*.so
 %{tcl_sitelib}/%{name}%{version}
+%{tcl_sitearch}/%{name}%{version}
 %{_mandir}/man3/*
 %{_mandir}/mann/*
 
@@ -99,6 +100,10 @@
 %{_includedir}/%{name}
 
 %changelog
+* Mon Jan 07 2008 Wart <wart at kobold.org> 2.4-24
+- Move pkgIndex.tcl file to %%{_libdir} as it contains arch-specific
+  components
+
 * Mon Jan 07 2008 Wart <wart at kobold.org> 2.4-23
 - Clean up spec file by creating patch for broken Makefile stanzas
 

blt2.4z-destdir.patch:

Index: blt2.4z-destdir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/blt/devel/blt2.4z-destdir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- blt2.4z-destdir.patch	7 Jan 2008 07:10:38 -0000	1.1
+++ blt2.4z-destdir.patch	7 Jan 2008 23:02:25 -0000	1.2
@@ -1,11 +1,31 @@
 --- blt2.4z/library/Makefile.in.orig	2008-01-06 20:06:26.000000000 -0800
-+++ blt2.4z/library/Makefile.in	2008-01-06 21:41:15.000000000 -0800
-@@ -58,15 +58,15 @@
++++ blt2.4z/library/Makefile.in	2008-01-07 14:52:17.000000000 -0800
+@@ -9,6 +9,9 @@
+ srcdir       = @srcdir@
+ libdir       = @libdir@
+ scriptdir    = @BLT_LIBRARY@
++# This should really be set by a configure switch.  For now it's a hack
++# for Fedora.
++pkglibdir    = @libdir@/tcl at TCL_VERSION@/blt$(version)
+ 
+ INSTALL      = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -39,7 +42,8 @@
+ 		tclIndex
+ 
+ instdirs     =  $(prefix) $(exec_prefix) \
+-		$(libdir) $(prefix)/lib $(scriptdir) $(scriptdir)/dd_protocols
++		$(libdir) $(prefix)/lib $(scriptdir) \
++		$(pkglibdir) $(scriptdir)/dd_protocols
+ 
+ all: pkgIndex
+ 
+@@ -58,15 +62,15 @@
  	for i in $(miscFiles) ; do \
  	    $(INSTALL_DATA) $(srcdir)/$$i $(INSTALL_ROOT)$(scriptdir) ; \
  	done 
 -	$(INSTALL_DATA) pkgIndex.tcl $(scriptdir)
-+	$(INSTALL_DATA) pkgIndex.tcl $(INSTALL_ROOT)$(scriptdir)
++	$(INSTALL_DATA) pkgIndex.tcl $(INSTALL_ROOT)$(pkglibdir)
  
  mkdirs:
  	@for i in $(instdirs) ; do \