- updated soname patch to use proper variable; patch pkgIndex.tcl for changed lib...

Changed files:
    itk-soname.patch -> 1.2
    itk.spec -> 1.2

diff --git a/itk-soname.patch b/itk-soname.patch
index 40cc5684b2a13ea85375d91432e742200f32f572..c07b8fea057fe2b610f19989f7c8679f5d9f657b 100644 (file)
--- a/itk-soname.patch
+++ b/itk-soname.patch
@@ -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@.0" Itk]

diff --git a/itk.spec b/itk.spec
index 40a9fc02c0e434c1055264b8366975e055904609..ba8f75c3eefcf9cf35eacad48fe439a4a6b26b10 100644 (file)
--- a/itk.spec
+++ b/itk.spec
@@ -93,6 +93,8 @@ ln -sf $libfile $RPM_BUILD_ROOT%{_libdir}/libitk.so
        -e 's,@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