packages: itcl/itcl-soname.patch, itcl/itcl.spec - updated to 3.4.1 - updat...

qboosh qboosh at pld-linux.org
Thu Dec 1 19:09:46 CET 2011 

Author: qboosh                       Date: Thu Dec  1 18:09:45 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 3.4.1
- updated soname patch
- separate build: itk and iwidgets moved to their own specs
- kill builddir references from itclConfig.sh

---- Files affected:
packages/itcl:
   itcl-soname.patch (1.7 -> 1.8) , itcl.spec (1.31 -> 1.32) 

---- Diffs:

================================================================
Index: packages/itcl/itcl-soname.patch
diff -u packages/itcl/itcl-soname.patch:1.7 packages/itcl/itcl-soname.patch:1.8
--- packages/itcl/itcl-soname.patch:1.7	Thu Apr  3 18:48:06 2008
+++ packages/itcl/itcl-soname.patch	Thu Dec  1 19:09:40 2011
@@ -1,5 +1,5 @@
---- incrTcl/itcl/Makefile.in.orig	2003-12-31 17:35:30.000000000 +0100
-+++ incrTcl/itcl/Makefile.in	2003-12-31 18:27:33.782467160 +0100
+--- itcl/Makefile.in.orig	2003-12-31 17:35:30.000000000 +0100
++++ itcl/Makefile.in	2003-12-31 18:27:33.782467160 +0100
 @@ -55,7 +55,7 @@
  # library that we are building.
  #========================================================================
@@ -20,40 +20,3 @@
  
  $(PKG_STUB_LIB_FILE): $(PKG_STUB_OBJECTS)
  	-rm -f $(PKG_STUB_LIB_FILE)
---- incrTcl/itk/Makefile.in.orig	2003-12-31 17:35:30.000000000 +0100
-+++ incrTcl/itk/Makefile.in	2003-12-31 18:28:13.290461032 +0100
-@@ -80,7 +80,7 @@
- # library that we are building.
- #========================================================================
- 
--PKG_LIB_FILE	= @PKG_LIB_FILE@
-+PKG_LIB_FILE	= @PKG_LIB_FILE at .0.0
- PKG_STUB_LIB_FILE = @PKG_STUB_LIB_FILE@
- 
- lib_BINARIES	= $(PKG_LIB_FILE)
-@@ -315,8 +315,8 @@
- 
- $(PKG_LIB_FILE): $(PKG_OBJECTS)
- 	-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
- 
- $(PKG_STUB_LIB_FILE): $(PKG_STUB_OBJECTS)
- 	-rm -f $(PKG_STUB_LIB_FILE)
---- incrTcl/itcl/configure.in~	2005-03-25 20:37:41.000000000 +0100
-+++ incrTcl/itcl/configure.in	2008-04-02 18:30:48.000000000 +0200
-@@ -220,10 +220,10 @@
-     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="${itcl_LIB_FLAG}"
- 
- itcl_BUILD_STUB_LIB_SPEC="-L`pwd` ${itcl_STUB_LIB_FLAG}"
--itcl_STUB_LIB_SPEC="-L${pkglibdir} ${itcl_STUB_LIB_FLAG}"
-+itcl_STUB_LIB_SPEC="${itcl_STUB_LIB_FLAG}"
- itcl_BUILD_STUB_LIB_PATH="`pwd`/${itcl_STUB_LIB_FILE}"
- itcl_STUB_LIB_PATH="${pkglibdir}/${itcl_STUB_LIB_FILE}"
- 

================================================================
Index: packages/itcl/itcl.spec
diff -u packages/itcl/itcl.spec:1.31 packages/itcl/itcl.spec:1.32
--- packages/itcl/itcl.spec:1.31	Fri Jul 11 21:08:48 2008
+++ packages/itcl/itcl.spec	Thu Dec  1 19:09:40 2011
@@ -1,31 +1,20 @@
 # $Revision$, $Date$
-# TODO: libitclstub*.a should exist in %{_libdir} not %{_ulibdir}
-
-%define	iwidgets_version 4.0.2
-
-%define _snap	20080403
-
 Summary:	[incr Tcl] - object-oriented extension of the Tcl language
 Summary(pl.UTF-8):	[incr Tcl] - obiektowo zorientowane rozszerzenie języka Tcl
 Name:		itcl
-Version:	3.4
-Release:	0.%{_snap}.2
+%define	vermaj	3.4
+Version:	%{vermaj}.1
+Release:	1
 License:	distributable
 Group:		Development/Languages/Tcl
-#Source0:	http://dl.sourceforge.net/incrtcl/%{name}%{version}.tar.gz
-Source0:	%{name}-CVS-%{_snap}.tar.bz2
-# Source0-md5:	8ac37bc9a01b25253e193e8b6a53a98d
-#Source1:	http://dl.sourceforge.net/incrtcl/iwidgets%{iwidgets_version}.tar.gz
-Source1:	iwidgets-CVS-%{_snap}.tar.bz2
-# Source1-md5:	7741d7e0b231a4875b0998d6b5c00615
+Source0:	http://downloads.sourceforge.net/incrtcl/%{name}%{version}.tar.gz
+# Source0-md5:	e7c98e0f69df1a675073ddd3344f0b7f
 Patch0:		%{name}-soname.patch
 URL:		http://incrtcl.sourceforge.net/itcl/
 BuildRequires:	autoconf >= 2.13
 BuildRequires:	automake
 BuildRequires:	tcl-devel >= 8.4.6
-BuildRequires:	tk-devel >= 8.4.6
 Requires:	tcl >= 8.4.6
-Requires:	tk >= 8.4.6
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_ulibdir	%{_prefix}/lib
@@ -53,69 +42,48 @@
 wynikający z tego kod jest łatwiejszy do zrozumienia i utrzymania.
 
 %package devel
-Summary:	Header files for itcl/itk libraries
-Summary(pl.UTF-8):	Pliki nagłówkowe dla itcl/itk libraries
+Summary:	Header files for itcl library
+Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki itcl
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	tcl-devel >= 8.4.6
-Requires:	tk-devel >= 8.4.6
 
 %description devel
-Header files for itcl/itk libraries.
+Header files for itcl library.
 
 %description devel -l pl.UTF-8
-Pliki nagłówkowe dla itcl/itk libraries.
+Pliki nagłówkowe biblioteki itcl.
 
 %prep
-%setup -q -c -a1
-%patch0 -p0
-
-ln -s incrTcl/itcl itcl
-ln -s incrTcl/itk itk
+%setup -q -n %{name}%{version}
+%patch0 -p1
 
 %build
-cd incrTcl
 %{__autoconf}
 %configure \
 	--libdir=%{_ulibdir}
 
 %{__make} \
-	CFLAGS_DEFAULT="%{rpmcflags} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
-
-cd ../iwidgets
-%{__autoconf}
-%configure \
-	--libdir=%{_ulibdir}
+	CFLAGS_DEFAULT=
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_libdir} \
-	$RPM_BUILD_ROOT%{_examplesdir}/%{name}-iwidgets-%{iwidgets_version}
-
-%{__make} -C incrTcl install \
-	DESTDIR=$RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{_libdir}
 
-%{__make} -C iwidgets install \
+%{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install -d iwidgets-docs
-cp -f iwidgets/{CHANGES,ChangeLog,README,license.terms} iwidgets-docs
+mv -f $RPM_BUILD_ROOT%{_ulibdir}/itcl%{vermaj}/libitcl* $RPM_BUILD_ROOT%{_libdir}
 
-ln -sf %{_ulibdir}/iwidgets%{iwidgets_version} $RPM_BUILD_ROOT%{_ulibdir}/iwidgets
-
-mv $RPM_BUILD_ROOT%{_ulibdir}/iwidgets%{iwidgets_version}/demos/* \
-	$RPM_BUILD_ROOT%{_examplesdir}/%{name}-iwidgets-%{iwidgets_version}
-
-mv -f $RPM_BUILD_ROOT%{_ulibdir}/itcl%{version}/lib*.so* $RPM_BUILD_ROOT%{_libdir}
-mv -f $RPM_BUILD_ROOT%{_ulibdir}/itk%{version}/lib*.so* $RPM_BUILD_ROOT%{_libdir}
-
-cd $RPM_BUILD_ROOT%{_libdir}
-ln -sf libitcl*.so.*.* libitcl%{version}.so.0
-ln -sf libitcl*.so.*.* libitcl%{version}.so
-ln -sf libitcl*.so.*.* libitcl.so
-ln -sf libitk*.so.*.* libitk%{version}.so.0
-ln -sf libitk*.so.*.* libitk%{version}.so
-ln -sf libitk*.so.*.* libitk.so
+libfile=$(basename $RPM_BUILD_ROOT%{_libdir}/libitcl%{vermaj}.so.0.*)
+ln -sf $libfile $RPM_BUILD_ROOT%{_libdir}/libitcl%{vermaj}.so.0
+ln -sf $libfile $RPM_BUILD_ROOT%{_libdir}/libitcl%{vermaj}.so
+ln -sf $libfile $RPM_BUILD_ROOT%{_libdir}/libitcl.so
+
+%{__sed} -i -e 's#-L[^ ]* ##' \
+	-e 's#%{_builddir}/%{name}%{version}#%{_libdir}#' \
+	-e 's#%{_ulibdir}/itcl%{vermajor}/lib#%{_libdir}/lib#' \
+	$RPM_BUILD_ROOT%{_ulibdir}/itclConfig.sh
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -125,34 +93,30 @@
 
 %files
 %defattr(644,root,root,755)
-%doc incrTcl/{CHANGES,ChangeLog,INCOMPATIBLE,README,TODO,license.terms} iwidgets-docs
-%attr(755,root,root) %{_libdir}/libitcl%{version}.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libitcl%{version}.so.0
-%attr(755,root,root) %{_libdir}/libitk%{version}.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libitk%{version}.so.0
-%dir %{_ulibdir}/itcl%{version}
-%{_ulibdir}/itcl%{version}/*.tcl
-%dir %{_ulibdir}/itk%{version}
-%{_ulibdir}/itk%{version}/*.itk
-%{_ulibdir}/itk%{version}/*.tcl
-%{_ulibdir}/itk%{version}/tclIndex
-%{_ulibdir}/iwidgets
-%dir %{_ulibdir}/iwidgets%{iwidgets_version}
-%{_ulibdir}/iwidgets%{iwidgets_version}/*.tcl
-%{_ulibdir}/iwidgets%{iwidgets_version}/scripts
-%{_mandir}/mann/*.n*
+%attr(755,root,root) %{_libdir}/libitcl%{vermaj}.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libitcl%{vermaj}.so.0
+%dir %{_ulibdir}/itcl%{vermaj}
+%{_ulibdir}/itcl%{vermaj}/*.tcl
+%{_mandir}/mann/body.n*
+%{_mandir}/mann/class.n*
+%{_mandir}/mann/code.n*
+%{_mandir}/mann/configbody.n*
+%{_mandir}/mann/delete.n*
+%{_mandir}/mann/ensemble.n*
+%{_mandir}/mann/find.n*
+%{_mandir}/mann/is.n*
+%{_mandir}/mann/itcl.n*
+%{_mandir}/mann/itclvars.n*
+%{_mandir}/mann/local.n*
+%{_mandir}/mann/scope.n*
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libitcl%{version}.so
+%attr(755,root,root) %{_libdir}/libitcl%{vermaj}.so
 %attr(755,root,root) %{_libdir}/libitcl.so
-%attr(755,root,root) %{_libdir}/libitk%{version}.so
-%attr(755,root,root) %{_libdir}/libitk.so
+%{_libdir}/libitclstub%{vermaj}.a
 %{_ulibdir}/itclConfig.sh
-%{_ulibdir}/itcl%{version}/libitclstub%{version}.a
 %{_includedir}/itcl*.h
-%{_includedir}/itk*.h
-%{_examplesdir}/%{name}-iwidgets-%{iwidgets_version}
 
 %define	date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -160,6 +124,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.32  2011/12/01 18:09:40  qboosh
+- updated to 3.4.1
+- updated soname patch
+- separate build: itk and iwidgets moved to their own specs
+- kill builddir references from itclConfig.sh
+
 Revision 1.31  2008/07/11 19:08:48  qboosh
 - ghost soname symlinks, file list cleanup
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/itcl/itcl-soname.patch?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/itcl/itcl.spec?r1=1.31&r2=1.32&f=u

More information about the pld-cvs-commit mailing list