rpms/tile/devel tile-0.7.2-broken-tclm4.patch, NONE, 1.1 tile.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Michael Thomas (wart) fedora-extras-commits at redhat.com
Thu Feb 23 07:34:09 UTC 2006


Author: wart

Update of /cvs/extras/rpms/tile/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5886/devel

Modified Files:
	.cvsignore sources 
Added Files:
	tile-0.7.2-broken-tclm4.patch tile.spec 
Log Message:
auto-import tile-0.7.2-3 on branch devel from tile-0.7.2-3.src.rpm

tile-0.7.2-broken-tclm4.patch:

--- NEW FILE tile-0.7.2-broken-tclm4.patch ---
diff -Naur --exclude '*.swp' tile-0.7.2/configure tile-0.7.2.new/configure
--- tile-0.7.2/configure	2005-10-14 19:22:38.000000000 -0700
+++ tile-0.7.2.new/configure	2006-02-22 14:15:54.000000000 -0800
@@ -1531,10 +1531,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
@@ -1714,10 +1716,12 @@
 
 	    # 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
@@ -6952,7 +6956,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`
@@ -9964,7 +9968,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 --exclude '*.swp' tile-0.7.2/tclconfig/tcl.m4 tile-0.7.2.new/tclconfig/tcl.m4
--- tile-0.7.2/tclconfig/tcl.m4	2005-10-04 14:59:13.000000000 -0700
+++ tile-0.7.2.new/tclconfig/tcl.m4	2006-01-11 21:10:30.000000000 -0800
@@ -106,10 +106,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
@@ -232,10 +234,12 @@
 
 	    # 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
@@ -848,7 +852,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`


--- NEW FILE tile.spec ---
Name:           tile
Version:        0.7.2
Release:        3%{?dist}
Summary:        Modernized widgets for Tk

Group:		Development/Libraries
License:        MIT
URL:            http://tktable.sourceforge.net/tile/
Source0:        http://download.sourceforge.net/tktable/tile-0.7.2.tar.gz
Patch0:         tile-0.7.2-broken-tclm4.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:       tcl tk
BuildRequires:  tk-devel

%description
The Tile Widget Set is an experimental reimplementation of
some of the core Tk widgets.  The primary purpose is
to generate ideas for how to build the next generation of Tk,
when the asteroid strikes and we prepare for the 9.0 release.

%package devel
Summary: Development libraries and headers for building against tile
Group: Development/Libraries
Requires: tile = %{version}
%description devel
Development libraries and headers for building against tile.

%prep
%setup -q
%patch0 -p1

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT/%{_mandir}/mann
mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man3

# The man pages have to be renamed so that they don't
# conflict with the man page names from the required
# tk package.
pushd doc
for i in *.n ; do 
    install -p $i $RPM_BUILD_ROOT/%{_mandir}/mann/tile_$i
done
install -p *.3 $RPM_BUILD_ROOT/%{_mandir}/man3/

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_libdir}/%{name}%{version}
%{_mandir}/mann/*
%{_mandir}/man3/*
%doc README.txt license.terms doc/converting.txt
%doc doc/html demos

%files devel
%defattr(-,root,root,-)
%{_includedir}/*.h
%{_libdir}/*.a

%changelog
* Wed Feb 22 2006 Wart <wart at kobold.org> - 0.7.2-3
- Add additional docuemntation
- Rename patch

* Wed Jan 11 2006 Wart <wart at kobold.org> - 0.7.2-2
- Fix configure quoting bug that was exposed by bash >= 3.1

* Fri Dec 9 2005 Wart <wart at kobold.org> - 0.7.2-1
- Initial Fedora spec file.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tile/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Feb 2006 07:33:26 -0000	1.1
+++ .cvsignore	23 Feb 2006 07:34:08 -0000	1.2
@@ -0,0 +1 @@
+tile-0.7.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tile/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Feb 2006 07:33:26 -0000	1.1
+++ sources	23 Feb 2006 07:34:08 -0000	1.2
@@ -0,0 +1 @@
+9a941d213b77b804af042d5a9434c024  tile-0.7.2.tar.gz




More information about the fedora-extras-commits mailing list