From ae0c636097a5ddbbef3434f678259a89ca76ed4d Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Thu, 14 Apr 2016 20:40:15 +0200 Subject: [PATCH] - updated to 4.0.2 (itk 3.x left on itk-3 branch) - updated soname patch --- itk-soname.patch | 9 ++++++--- itk.spec | 49 ++++++++++++++++++++++++------------------------ 2 files changed, 30 insertions(+), 28 deletions(-) diff --git a/itk-soname.patch b/itk-soname.patch index c07b8fe..0325a2f 100644 --- a/itk-soname.patch +++ b/itk-soname.patch @@ -20,10 +20,13 @@ $(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 @@ +--- itk4.0.2/pkgIndex.tcl.in.orig 2016-02-16 21:02:10.000000000 +0100 ++++ itk4.0.2/pkgIndex.tcl.in 2016-03-10 21:45:05.467914211 +0100 +@@ -1,5 +1,5 @@ # Tcl package index file, version 1.0 + if {![package vsatisfies [package present Tcl] 8.6]} return +-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] ++package ifneeded itk @PACKAGE_VERSION@ [list load "@libdir@/@PKG_LIB_FILE@.0" Itk] +package ifneeded Itk @PACKAGE_VERSION@ [list load "@libdir@/@PKG_LIB_FILE@.0" Itk] diff --git a/itk.spec b/itk.spec index 1ccee1b..d40902e 100644 --- a/itk.spec +++ b/itk.spec @@ -1,21 +1,20 @@ Summary: [incr Tk] - object-oriented extension of the Tcl/Tk language Summary(pl.UTF-8): [incr Tk] - obiektowo zorientowane rozszerzenie języka Tcl/Tk Name: itk -%define vermaj 3.4 -Version: %{vermaj}.2 +Version: 4.0.2 Release: 1 License: Tcl (BSD-like) Group: Development/Languages/Tcl Source0: http://downloads.sourceforge.net/incrtcl/%{name}%{version}.tar.gz -# Source0-md5: e05b7a47f3dd026345d98fa3a4cdfde1 +# Source0-md5: 58f46bd5bba8d2ef12a1c553d8da6434 Patch0: %{name}-soname.patch Patch1: %{name}-tclconfig.patch URL: http://incrtcl.sourceforge.net/itk/ BuildRequires: autoconf >= 2.13 -BuildRequires: itcl-devel >= 3.4.1 -BuildRequires: tk-devel >= 8.4.6 -Requires: itcl >= 3.4.1 -Requires: tk >= 8.4.6 +BuildRequires: itcl-devel >= 4.0 +BuildRequires: tk-devel >= 8.6 +Requires: itcl >= 4.0 +Requires: tk >= 8.6 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _ulibdir %{_prefix}/lib @@ -42,8 +41,8 @@ Summary: Header files for itk library Summary(pl.UTF-8): Pliki nagłówkowe biblioteki itk Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: itcl-devel >= 3.4.1 -Requires: tk-devel >= 8.4.6 +Requires: itcl-devel >= 4.0 +Requires: tk-devel >= 8.6 %description devel Header files for itk library. @@ -52,7 +51,7 @@ Header files for itk library. Pliki nagłówkowe biblioteki itk. %prep -%setup -q -n %{name}%{vermaj} +%setup -q -n %{name}%{version} %patch0 -p1 %patch1 -p1 @@ -71,25 +70,25 @@ install -d $RPM_BUILD_ROOT%{_libdir} %{__make} install \ DESTDIR=$RPM_BUILD_ROOT -%{__mv} $RPM_BUILD_ROOT%{_ulibdir}/itk%{vermaj}/libitk* $RPM_BUILD_ROOT%{_libdir} +%{__mv} $RPM_BUILD_ROOT%{_ulibdir}/itk%{version}/libitk* $RPM_BUILD_ROOT%{_libdir} -libfile=$(basename $RPM_BUILD_ROOT%{_libdir}/libitk%{vermaj}.so.0.*) -ln -sf $libfile $RPM_BUILD_ROOT%{_libdir}/libitk%{vermaj}.so.0 -ln -sf $libfile $RPM_BUILD_ROOT%{_libdir}/libitk%{vermaj}.so +libfile=$(basename $RPM_BUILD_ROOT%{_libdir}/libitk%{version}.so.0.*) +ln -sf $libfile $RPM_BUILD_ROOT%{_libdir}/libitk%{version}.so.0 +ln -sf $libfile $RPM_BUILD_ROOT%{_libdir}/libitk%{version}.so ln -sf $libfile $RPM_BUILD_ROOT%{_libdir}/libitk.so # some substs missing in configure, install missing in Makefile %{__sed} -i -e "s,ITCL_VERSION='@ITCL_VERSION@',ITK_VERSION='%{version}'," \ - -e 's,@ITK_LIB_FILE@,libitk%{vermaj}.so,' \ - -e 's,@ITK_BUILD_LIB_SPEC@,-litk%{vermaj},' \ - -e 's,@ITK_LIB_SPEC@,-litk%{vermaj},' \ + -e 's,@ITK_LIB_FILE@,libitk%{version}.so,' \ + -e 's,@ITK_BUILD_LIB_SPEC@,-litk%{version},' \ + -e 's,@ITK_LIB_SPEC@,-litk%{version},' \ -e 's,@ITK_STUB_LIB_FILE@,,' \ -e 's,@ITK_BUILD_STUB_LIB_SPEC@,,' \ -e 's,@ITK_STUB_LIB_SPEC@,,' \ -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%{vermaj}/pkgIndex.tcl +%{__sed} -i -e 's#%{_ulibdir}#%{_libdir}#' $RPM_BUILD_ROOT%{_ulibdir}/itk%{version}/pkgIndex.tcl %clean rm -rf $RPM_BUILD_ROOT @@ -100,12 +99,12 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) %doc license.terms -%attr(755,root,root) %{_libdir}/libitk%{vermaj}.so.*.* -%attr(755,root,root) %ghost %{_libdir}/libitk%{vermaj}.so.0 -%dir %{_ulibdir}/itk%{vermaj} -%{_ulibdir}/itk%{vermaj}/*.itk -%{_ulibdir}/itk%{vermaj}/*.tcl -%{_ulibdir}/itk%{vermaj}/tclIndex +%attr(755,root,root) %{_libdir}/libitk%{version}.so.*.* +%attr(755,root,root) %ghost %{_libdir}/libitk%{version}.so.0 +%dir %{_ulibdir}/itk%{version} +%{_ulibdir}/itk%{version}/*.itk +%{_ulibdir}/itk%{version}/*.tcl +%{_ulibdir}/itk%{version}/tclIndex %{_mandir}/mann/Archetype.n* %{_mandir}/mann/Toplevel.n* %{_mandir}/mann/Widget.n* @@ -115,7 +114,7 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/libitk%{vermaj}.so +%attr(755,root,root) %{_libdir}/libitk%{version}.so %attr(755,root,root) %{_libdir}/libitk.so %{_ulibdir}/itkConfig.sh %{_includedir}/itk*.h -- 2.44.0