rpms/itk/devel itk-3.3-autotools.patch, NONE, 1.1 itk.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Michael Thomas (wart)
fedora-extras-commits at redhat.com
Wed Feb 22 05:51:13 UTC 2006
Author: wart
Update of /cvs/extras/rpms/itk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6919/devel
Modified Files:
.cvsignore sources
Added Files:
itk-3.3-autotools.patch itk.spec
Log Message:
auto-import itk-3.3-0.2.RC1 on branch devel from itk-3.3-0.2.RC1.src.rpm
itk-3.3-autotools.patch:
--- NEW FILE itk-3.3-autotools.patch ---
diff -Naur itk3.3/configure itk3.3.new/configure
--- itk3.3/configure 2005-03-25 11:39:53.000000000 -0800
+++ itk3.3.new/configure 2006-01-11 20:46:08.000000000 -0800
@@ -1545,10 +1545,12 @@
# check in a few common install locations
if test x"${ac_cv_c_tclconfig}" = x ; then
- for i in `ls -d ${exec_prefix}/lib 2>/dev/null` \
+ for i in `ls -d ${libdir} 2>/dev/null` \
+ `ls -d ${exec_prefix}/lib 2>/dev/null` \
`ls -d ${prefix}/lib 2>/dev/null` \
`ls -d /usr/local/lib 2>/dev/null` \
`ls -d /usr/contrib/lib 2>/dev/null` \
+ `ls -d /usr/lib64 2>/dev/null` \
`ls -d /usr/lib 2>/dev/null` \
; do
if test -f "$i/tclConfig.sh" ; then
@@ -1718,10 +1720,12 @@
fi
# check in a few common install locations
if test x"${ac_cv_c_tkconfig}" = x ; then
- for i in `ls -d ${exec_prefix}/lib 2>/dev/null` \
+ for i in `ls -d ${libdir} 2>/dev/null` \
+ `ls -d ${exec_prefix}/lib 2>/dev/null` \
`ls -d ${prefix}/lib 2>/dev/null` \
`ls -d /usr/local/lib 2>/dev/null` \
`ls -d /usr/contrib/lib 2>/dev/null` \
+ `ls -d /usr/lib64 2>/dev/null` \
`ls -d /usr/lib 2>/dev/null` \
; do
if test -f "$i/tkConfig.sh" ; then
@@ -1895,10 +1899,12 @@
# check in a few common install locations
if test x"${ac_cv_c_itclconfig}" = x ; then
- for i in `ls -d ${exec_prefix}/lib 2>/dev/null` \
+ for i in `ls -d ${libdir} 2>/dev/null` \
+ `ls -d ${exec_prefix}/lib 2>/dev/null` \
`ls -d ${prefix}/lib 2>/dev/null` \
`ls -d /usr/local/lib 2>/dev/null` \
`ls -d /usr/contrib/lib 2>/dev/null` \
+ `ls -d /usr/lib64 2>/dev/null` \
`ls -d /usr/lib 2>/dev/null` \
; do
if test -f "$i/itclConfig.sh" ; then
@@ -7288,7 +7294,7 @@
# results, and the version is kept in special file).
if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
- system=MP-RAS-`awk '{print }' /etc/.relid'`
+ system=MP-RAS-`awk '{print }' /etc/.relid`
fi
if test "`uname -s`" = "AIX" ; then
system=AIX-`uname -v`.`uname -r`
diff -Naur itk3.3/generic/itk_cmds.c itk3.3.new/generic/itk_cmds.c
--- itk3.3/generic/itk_cmds.c 2005-03-25 14:58:09.000000000 -0800
+++ itk3.3.new/generic/itk_cmds.c 2006-01-09 14:06:51.000000000 -0800
@@ -70,6 +70,7 @@
lappend dirs [file join [file dirname $tcl_library] itk$version]\n\
set bindir [file dirname [info nameofexecutable]]\n\
lappend dirs [file join $bindir .. lib itk$version]\n\
+ lappend dirs [file join $bindir .. lib64 itk$version]\n\
lappend dirs [file join $bindir .. library]\n\
lappend dirs [file join $bindir .. .. library]\n\
lappend dirs [file join $bindir .. .. itk library]\n\
diff -Naur itk3.3/tclconfig/tcl.m4 itk3.3.new/tclconfig/tcl.m4
--- itk3.3/tclconfig/tcl.m4 2005-04-05 11:07:03.000000000 -0700
+++ itk3.3.new/tclconfig/tcl.m4 2006-01-11 20:46:14.000000000 -0800
@@ -88,10 +88,12 @@
# check in a few common install locations
if test x"${ac_cv_c_tclconfig}" = x ; then
- for i in `ls -d ${exec_prefix}/lib 2>/dev/null` \
+ for i in `ls -d ${libdir} 2>/dev/null` \
+ `ls -d ${exec_prefix}/lib 2>/dev/null` \
`ls -d ${prefix}/lib 2>/dev/null` \
`ls -d /usr/local/lib 2>/dev/null` \
`ls -d /usr/contrib/lib 2>/dev/null` \
+ `ls -d /usr/lib64 2>/dev/null` \
`ls -d /usr/lib 2>/dev/null` \
; do
if test -f "$i/tclConfig.sh" ; then
@@ -199,12 +201,13 @@
fi
# check in a few common install locations
if test x"${ac_cv_c_tkconfig}" = x ; then
- for i in `ls -d ${exec_prefix}/lib 2>/dev/null` \
+ for i in `ls -d ${libdir} 2>/dev/null` \
+ `ls -d ${exec_prefix}/lib 2>/dev/null` \
`ls -d ${prefix}/lib 2>/dev/null` \
`ls -d /usr/local/lib 2>/dev/null` \
`ls -d /usr/contrib/lib 2>/dev/null` \
+ `ls -d /usr/lib64 2>/dev/null` \
`ls -d /usr/lib 2>/dev/null` \
- ; do
if test -f "$i/tkConfig.sh" ; then
ac_cv_c_tkconfig=`(cd $i; pwd)`
break
@@ -794,7 +797,7 @@
# results, and the version is kept in special file).
if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
- system=MP-RAS-`awk '{print $3}' /etc/.relid'`
+ system=MP-RAS-`awk '{print $3}' /etc/.relid`
fi
if test "`uname -s`" = "AIX" ; then
system=AIX-`uname -v`.`uname -r`
@@ -3639,10 +3642,12 @@
# check in a few common install locations
if test x"${ac_cv_c_$1config}" = x ; then
- for i in `ls -d ${exec_prefix}/lib 2>/dev/null` \
+ for i in `ls -d ${libdir} 2>/dev/null` \
+ `ls -d ${exec_prefix}/lib 2>/dev/null` \
`ls -d ${prefix}/lib 2>/dev/null` \
`ls -d /usr/local/lib 2>/dev/null` \
`ls -d /usr/contrib/lib 2>/dev/null` \
+ `ls -d /usr/lib64 2>/dev/null` \
`ls -d /usr/lib 2>/dev/null` \
; do
if test -f "$i/$1Config.sh" ; then
--- NEW FILE itk.spec ---
Name: itk
Version: 3.3
Release: 0.2.RC1%{?dist}
Summary: Object oriented extensions to Tk
Group: Development/Libraries
License: BSD
URL: http://incrtcl.sourceforge.net/itcl/
Source0: http://easynews.dl.sourceforge.net/sourceforge/incrtcl/itk3.3.tar.gz
Patch0: itk-3.3-autotools.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: itcl tk
BuildRequires: tk-devel itcl-devel
%description
[incr Tk] is Tk extension that provides object-oriented features that are
missing from the Tk extension to Tcl. The OO features provided by itk are
useful for building megawidgets.
%package devel
Summary: Development headers and libraries for linking against itk
Group: Development/Libraries
Requires: itk = %{version}
%description devel
Development headers and libraries for linking against itk.
%prep
%setup -q -n itk3.3
%patch -p1
%build
%configure
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%dir %{_libdir}/itk3.3
%{_libdir}/itk3.3/*.so
%{_libdir}/itk3.3/*.itk
%{_libdir}/itk3.3/*.tcl
%{_libdir}/itk3.3/tclIndex
%{_mandir}/mann/*.gz
%doc README license.terms
%files devel
%defattr(-,root,root,-)
%{_includedir}/*.h
%doc
%changelog
* Wed Jan 11 2006 Wart <wart at kobold.org> - 3.3-0.2.RC1
- Fix quoting bug that is exposed by bash >= 3.1
* Mon Jan 9 2006 Wart <wart at kobold.org> - 3.3-0.1.RC1
- New itk package from newly separated itk upstream sources.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/itk/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 22 Feb 2006 05:50:43 -0000 1.1
+++ .cvsignore 22 Feb 2006 05:51:13 -0000 1.2
@@ -0,0 +1 @@
+itk3.3.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/itk/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 22 Feb 2006 05:50:43 -0000 1.1
+++ sources 22 Feb 2006 05:51:13 -0000 1.2
@@ -0,0 +1 @@
+a97c17f3cfa5e377f43073c653c501b5 itk3.3.tar.gz
More information about the scm-commits
mailing list