Attachment 153780 Details for Bug 238293 – Updated again to work on 64-bit

[patch] Updated again to work on 64-bit

spec.patch (text/plain), 2.37 KB, created by Eric Hopper on 2007-04-30 11:03:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Eric Hopper

Created: 2007-04-30 11:03:25 UTC

Size: 2.37 KB

patch

obsolete

>--- SPECS.old/blt.spec	2007-04-30 04:00:22.000000000 -0700
>+++ SPECS/blt.spec	2007-04-30 03:58:18.000000000 -0700
>@@ -1,7 +1,7 @@
> Summary: BLT widget extension to Tcl/Tk scripting language development
> Name: blt
>-Version: 2.4
>-Release: 14.z%{?dist}
>+Version: 2.4z
>+Release: 17%{?dist}
> 
> License: MIT
> Group: Development/Libraries
>@@ -23,12 +23,12 @@
> with Tcl/Tk versions after and including 8.3.1.
> 
> %prep
>-%setup -q -n %{name}%{version}z
>+%setup -q -n %{name}%{version}
> %patch0 -p1
> %patch1 -p1
> 
> %build
>-%configure --with-tcl=%{_libdir} --with-tk=%{_libdir}
>+%configure --with-tcl=%{_prefix}/lib --with-tk=%{_prefix}/lib
> cd src/shared
> %__make SHLIB_LD_FLAGS=-shared # no _smp_mflags; race conditions.
> 
>@@ -36,8 +36,10 @@
> rm -rf $RPM_BUILD_ROOT
> DIRECTORY=$RPM_BUILD_ROOT%{_libdir}/%{name}%{version}
> install -d $DIRECTORY
>-install -m 755 -p src/shared/libBLT24.so src/shared/libBLTlite24.so $DIRECTORY
>+install -d $RPM_BUILD_ROOT%{_includedir}
>+install -m 755 -p src/shared/libBLT24.so src/shared/libBLTlite24.so $RPM_BUILD_ROOT%{_libdir}
> install -m 644 -p library/*.{pro,tcl,xbm} library/tclIndex $DIRECTORY
>+install -m 644 -p src/blt.h src/blt{Hash,Pool,Vector}.h $RPM_BUILD_ROOT%{_includedir}
> echo 'package ifneeded BLT 2.4 "if {[llength [info commands tk]] > 0} {load [file join $dir libBLT24.so]} else {load [file join $dir libBLTlite24.so] BLT}"' > $DIRECTORY/pkgIndex.tcl
> cp -p -r library/dd_protocols $DIRECTORY
> rm -f html/Makefile.vc
>@@ -48,10 +50,26 @@
> %files
> %defattr(-,root,root,0755)
> %doc README INSTALL PROBLEMS html/
>-%{_libdir}/%{name}%{version}/
>+%{_libdir}/lib*
>+%{_libdir}/%{name}%{version}
>+%{_includedir}/*.h
> 
> %changelog
> 
>+* Mon Apr 30 2007 Eric Hopper <hopper@omnifarious.org> 2.4z-17
>+- Change to use %{_prefix}/lib for --with-tcl and --with-tk because in their
>+  infinite wisdom, this is where the maintainers of those packages put the
>+  respect tclConfig.sh and tkConfig.sh files.  Without this, the build breaks
>+  on a 64-bit platform.
>+
>+* Mon Apr 30 2007 Eric Hopper <hopper@omnifarious.org> 2.4z-16
>+- Folded -devel package back into main package.
>+- Made 'z' part of source version number rather than package version number
>+
>+* Sun Apr 29 2007 Eric Hopper <hopper@omnifarious.org> 2.4-15
>+- Added -devel package
>+- Made sure shared libraries are installed
>+
> * Mon Aug 28 2006 Jean-Luc Fontaine <jfontain@free.fr> 2.4-14.z
> - added dist tag
> - rebuild for Fedora Extras 6

Actions: View | Diff

Attachments on bug 238293: 153752 | 153779 | 153780