packages: itk/itk-soname.patch, itk/itk.spec - updated soname patch to use ...

[qboosh]

Author: qboosh                       Date: Fri Dec  2 16:57:34 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated soname patch to use proper variable; patch pkgIndex.tcl for changed lib dir/soname

---- Files affected:
packages/itk:
   itk-soname.patch (1.1 -> 1.2) , itk.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/itk/itk-soname.patch
diff -u packages/itk/itk-soname.patch:1.1 packages/itk/itk-soname.patch:1.2
--- packages/itk/itk-soname.patch:1.1	Thu Dec  1 19:04:50 2011
+++ packages/itk/itk-soname.patch	Fri Dec  2 17:57:29 2011
@@ -15,8 +15,15 @@
  	-rm -f $(PKG_LIB_FILE)
 -	${MAKE_LIB}
 -	$(RANLIB) $(PKG_LIB_FILE)
-+	${MAKE_LIB} -Wl,-soname,libitk$(VERSION).so.0
-+	-ln -sf $(PKG_LIB_FILE) libitk$(VERSION).so.0
++	${MAKE_LIB} -Wl,-soname,libitk$(PACKAGE_VERSION).so.0
++	-ln -sf $(PKG_LIB_FILE) libitk$(PACKAGE_VERSION).so.0
  
  $(PKG_STUB_LIB_FILE): $(PKG_STUB_OBJECTS)
  	-rm -f $(PKG_STUB_LIB_FILE)
+--- itk/pkgIndex.tcl.in.orig	2011-11-28 19:12:31.000000000 +0100
++++ itk/pkgIndex.tcl.in	2011-12-02 17:54:08.883259093 +0100
+@@ -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 "@libdir@/@PKG_LIB_FILE at .0" Itk]

================================================================
Index: packages/itk/itk.spec
diff -u packages/itk/itk.spec:1.1 packages/itk/itk.spec:1.2
--- packages/itk/itk.spec:1.1	Thu Dec  1 19:04:50 2011
+++ packages/itk/itk.spec	Fri Dec  2 17:57:29 2011
@@ -94,6 +94,8 @@
 	-e 's, at ITK_SRC_DIR@,%{_ulibdir},' itkConfig.sh
 install itkConfig.sh $RPM_BUILD_ROOT%{_ulibdir}
 
+%{__sed} -i -e 's#%{_ulibdir}#%{_libdir}#' $RPM_BUILD_ROOT%{_ulibdir}/itk%{version}/pkgIndex.tcl
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -128,6 +130,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2011/12/02 16:57:29  qboosh
+- updated soname patch to use proper variable; patch pkgIndex.tcl for changed lib dir/soname
+
 Revision 1.1  2011/12/01 18:04:50  qboosh
 - separated from itcl.spec
 - updated to latest fossil snapshot
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/itk/itk-soname.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/itk/itk.spec?r1=1.1&r2=1.2&f=u