rpms/magic/FC-6 magic-7.4.35-64bit.patch, NONE, 1.1 magic.spec, 1.3, 1.4
Chitlesh GOORAH (chitlesh)
fedora-extras-commits at redhat.com
Sun Jul 8 07:06:15 UTC 2007
Author: chitlesh
Update of /cvs/extras/rpms/magic/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17891/FC-6
Modified Files:
magic.spec
Added Files:
magic-7.4.35-64bit.patch
Log Message:
magic-7.4.35-64bit.patch:
--- NEW FILE magic-7.4.35-64bit.patch ---
--- tcltk/tkcon.tcl 2006-04-11 00:02:12.000000000 +0200
+++ tkcon.tcl 2007-07-08 02:49:34.000000000 +0200
@@ -2,6 +2,16 @@
# \
exec ${MAGIC_WISH:=wish} "$0" ${1+"$@"}
+set i [ lsearch $auto_path /usr/lib ]
+set j [ lsearch $auto_path /usr/lib64 ]
+puts stderr "old auto_path: $auto_path"
+puts stderr "i: $i j: $j"
+if {$i >= 0 && $j >= 0 && $i < $j} {
+ set auto_path [lreplace $auto_path $i $i /usr/lib64 ]
+ set auto_path [lreplace $auto_path $j $j /usr/lib ]
+}
+puts stderr "new auto_path: $auto_path"
+
#
## tkcon.tcl
## Enhanced Tk Console, part of the VerTcl system
@@ -36,7 +46,7 @@
#
# set ::tkcon::PRIV(proxy) {wwwproxy:8080 1}
#
-# Or you can set the above variable from within tkcon by calling
+# Or you can set the above variable from within tkcon by calling
#
# tkcon master set ::tkcon:PRIV(proxy) wwwproxy:8080
#
@@ -654,7 +664,7 @@
## ::tkcon::EvalCmd) in turn. Any uncompleted command will not be eval'ed.
# ARGS: w - console text widget
# Calls: ::tkcon::CmdGet, ::tkcon::CmdSep, ::tkcon::EvalCmd
-##
+##
proc ::tkcon::Eval {w} {
set incomplete [CmdSep [CmdGet $w] cmds last]
$w mark set insert end-1c
@@ -674,7 +684,7 @@
# Calls: ::tkcon::Prompt
# Outputs: result of command to stdout (or stderr if error occured)
# Returns: next event number
-##
+##
proc ::tkcon::EvalCmd {w cmd} {
variable OPT
variable PRIV
@@ -905,7 +915,7 @@
## ::tkcon::EvalNamespace - evaluates the args in a particular namespace
## This is an override for ::tkcon::EvalAttached for when the user wants
## to attach to a particular namespace of the attached interp
-# ARGS: attached
+# ARGS: attached
# namespace the namespace to evaluate in
# args the args to evaluate
# RETURNS: the result of the command
@@ -933,7 +943,7 @@
## ::tkcon::CmdGet - gets the current command from the console widget
# ARGS: w - console text widget
# Returns: text which compromises current command line
-##
+##
proc ::tkcon::CmdGet w {
if {![llength [$w tag nextrange prompt limit end]]} {
$w tag add stdin limit end-1c
@@ -947,7 +957,7 @@
# last - varname of any remainder (like an incomplete final command).
# If there is only one command, it's placed in this var.
# Returns: constituent command info in varnames specified by list & rmd.
-##
+##
proc ::tkcon::CmdSep {cmd list last} {
upvar 1 $list cmds $last inc
set inc {}
@@ -974,7 +984,7 @@
## ::tkcon::CmdSplit - splits multiple commands into a list
# ARGS: cmd - (possible) multiple command to separate
# Returns: constituent commands in a list
-##
+##
proc ::tkcon::CmdSplit {cmd} {
set inc {}
set cmds {}
@@ -998,7 +1008,7 @@
## Called by ::tkcon::EvalCmd
# ARGS: w - text widget
# Outputs: tag name guaranteed unique in the widget
-##
+##
proc ::tkcon::UniqueTag {w} {
set tags [$w tag names]
set idx 0
@@ -1011,7 +1021,7 @@
# ARGS: w - console text widget
# size - # of lines to constrain to
# Outputs: may delete data in console widget
-##
+##
proc ::tkcon::ConstrainBuffer {w size} {
if {[$w index end] > $size} {
$w delete 1.0 [expr {int([$w index end])-$size}].0
@@ -1021,7 +1031,7 @@
## ::tkcon::Prompt - displays the prompt in the console widget
# ARGS: w - console text widget
# Outputs: prompt (specified in ::tkcon::OPT(prompt1)) to console
-##
+##
proc ::tkcon::Prompt {{pre {}} {post {}} {prompt {}}} {
variable OPT
variable PRIV
@@ -1053,7 +1063,7 @@
}
## ::tkcon::About - gives about info for tkcon
-##
+##
proc ::tkcon::About {} {
variable OPT
variable PRIV
@@ -1088,7 +1098,7 @@
## ::tkcon::InitMenus - inits the menubar and popup for the console
# ARGS: w - console text widget
-##
+##
proc ::tkcon::InitMenus {w title} {
variable OPT
variable PRIV
@@ -1521,7 +1531,7 @@
}
}
-## Namepaces List
+## Namepaces List
##
proc ::tkcon::NamespacesList {names} {
variable PRIV
@@ -1894,7 +1904,7 @@
## The file is actually sourced in the currently attached's interp
# ARGS: fn - (optional) filename to source in
# Returns: selected filename ({} if nothing was selected)
-##
+##
proc ::tkcon::Load { {fn ""} } {
set types {
{{Tcl Files} {.tcl .tk}}
@@ -1913,7 +1923,7 @@
## This does not eval in a slave because it's not necessary
# ARGS: w - console text widget
# fn - (optional) filename to save to
-##
+##
proc ::tkcon::Save { {fn ""} {type ""} {opt ""} {mode w} } {
variable PRIV
@@ -1983,7 +1993,7 @@
## Creates a slave interpreter and sources in this script.
## All other interpreters also get a command to eval function in the
## new interpreter.
- ##
+ ##
proc ::tkcon::New {} {
variable PRIV
global argv0 argc argv
@@ -2020,7 +2030,7 @@
## ::tkcon::Exit - full exit OR destroy slave console
## This proc should only be called in the main interpreter from a slave.
## The master determines whether we do a full exit or just kill the slave.
- ##
+ ##
proc ::tkcon::Exit {slave args} {
variable PRIV
variable OPT
@@ -2043,7 +2053,7 @@
## This proc should only be called by the main interpreter. If it is
## called from there, it will ask before exiting tkcon. All others
## (slaves) will just have their slave interpreter deleted, closing them.
- ##
+ ##
proc ::tkcon::Destroy {{slave {}}} {
variable PRIV
@@ -2513,7 +2523,7 @@
## This always exists in the main interpreter, and is aliased into
## other connected interpreters
# ARGS: totally variable, see internal comments
-##
+##
proc tkcon {cmd args} {
global errorInfo
@@ -2795,9 +2805,9 @@
## This allows me to capture all stdout/stderr to the console window
## This will be renamed to 'puts' at the appropriate time during init
##
-# ARGS: same as usual
+# ARGS: same as usual
# Outputs: the string with a color-coded text tag
-##
+##
proc tkcon_puts args {
set len [llength $args]
foreach {arg1 arg2 arg3} $args { break }
@@ -2859,7 +2869,7 @@
set sarg [string range $sarg 0 [expr {$bpt - 1}]]
set nl 0
}
-
+
if {$nl == 0} {
tkcon console insert output $sarg $farg
@@ -2899,7 +2909,7 @@
## This allows me to capture all stdin input without needing to stdin
## This will be renamed to 'gets' at the appropriate time during init
##
-# ARGS: same as gets
+# ARGS: same as gets
# Outputs: same as gets
##
proc tkcon_gets args {
@@ -2923,12 +2933,12 @@
}
## edit - opens a file/proc/var for reading/editing
-##
+##
# Arguments:
# type proc/file/var
# what the actual name of the item
# Returns: nothing
-##
+##
proc edit {args} {
array set opts {-find {} -type {} -attach {}}
while {[string match -* [lindex $args 0]]} {
@@ -3080,7 +3090,7 @@
## clear - clears the buffer of the console (not the history though)
## This is executed in the parent interpreter
-##
+##
proc clear {{pcnt 100}} {
if {![regexp {^[0-9]*$} $pcnt] || $pcnt < 1 || $pcnt > 100} {
return -code error \
@@ -3098,7 +3108,7 @@
## If called with one arg, returns the alias of that arg (or {} if none)
# ARGS: newcmd - (optional) command to bind alias to
# args - command and args being aliased
-##
+##
proc alias {{newcmd {}} args} {
if {[string match {} $newcmd]} {
set res {}
@@ -3115,7 +3125,7 @@
## unalias - unaliases an alias'ed command
# ARGS: cmd - command to unbind as an alias
-##
+##
proc unalias {cmd} {
interp alias {} $cmd {}
}
@@ -3135,7 +3145,7 @@
# -- forcibly ends options recognition
#
# Returns: the values of the requested items in a 'source'able form
-##
+##
proc dump {type args} {
set whine 1
set code ok
@@ -3687,13 +3697,13 @@
## which - tells you where a command is found
# ARGS: cmd - command name
# Returns: where command is found (internal / external / unknown)
-##
+##
proc which cmd {
## This tries to auto-load a command if not recognized
set types [uplevel 1 [list what $cmd 1]]
if {[llength $types]} {
set out {}
-
+
foreach type $types {
switch -- $type {
alias { set res "$cmd: aliased to [alias $cmd]" }
@@ -3724,7 +3734,7 @@
## what - tells you what a string is recognized as
# ARGS: str - string to id
# Returns: id types of command as list
-##
+##
proc what {str {autoload 0}} {
set types {}
if {[llength [info commands $str]] || ($autoload && \
@@ -3771,7 +3781,7 @@
# -long - list in full format "permissions size date filename"
# -full - displays / after directories and link paths for links
# Returns: a directory listing
-##
+##
proc dir {args} {
array set s {
all 0 full 0 long 0
@@ -4181,7 +4191,7 @@
}
## Get all Text bindings into TkConsole
- foreach ev [bind Text] { bind TkConsole $ev [bind Text $ev] }
+ foreach ev [bind Text] { bind TkConsole $ev [bind Text $ev] }
## We really didn't want the newline insertion
bind TkConsole <Control-Key-o> {}
@@ -4648,7 +4658,7 @@
# c1 - first char of pair
# c2 - second char of pair
# Calls: ::tkcon::Blink
-##
+##
proc ::tkcon::MatchPair {w c1 c2 {lim 1.0}} {
if {[string compare {} [set ix [$w search -back $c1 insert $lim]]]} {
while {
@@ -4686,7 +4696,7 @@
## The quote to match is assumed to be at the text index 'insert'.
# ARGS: w - console text widget
# Calls: ::tkcon::Blink
-##
+##
proc ::tkcon::MatchQuote {w {lim 1.0}} {
set i insert-1c
set j 0
@@ -4712,7 +4722,7 @@
# i2 - end index of blink region
# dur - duration in usecs to blink for
# Outputs: blinks selected characters in $w
-##
+##
proc ::tkcon::Blink {w args} {
eval [list $w tag add blink] $args
after $::tkcon::OPT(blinktime) [list $w] tag remove blink $args
@@ -4727,7 +4737,7 @@
# ARGS: w - text window in which to insert the string
# s - string to insert (usually just a single char)
# Outputs: $s to text widget
-##
+##
proc ::tkcon::Insert {w s} {
if {[string match {} $s] || [string match disabled [$w cget -state]]} {
return
@@ -4743,7 +4753,7 @@
$w see insert
}
-## ::tkcon::Expand -
+## ::tkcon::Expand -
# ARGS: w - text widget in which to expand str
# type - type of expansion (path / proc / variable)
# Calls: ::tkcon::Expand(Pathname|Procname|Variable)
@@ -4752,7 +4762,7 @@
# match equaled the string to expand, then all possible matches
# are output to stdout. Triggers bell if no matches are found.
# Returns: number of matches found
-##
+##
proc ::tkcon::Expand {w {type ""}} {
set exp "\[^\\\\\]\[\[ \t\n\r\\\{\"$\]"
set tmp [$w search -backwards -regexp $exp insert-1c limit-1c]
@@ -4791,7 +4801,7 @@
# Calls: ::tkcon::ExpandBestMatch
# Returns: list containing longest unique match followed by all the
# possible further matches
-##
+##
proc ::tkcon::ExpandPathname str {
set pwd [EvalAttached pwd]
# Cause a string like {C:/Program\ Files/} to become "C:/Program Files/"
@@ -4873,7 +4883,7 @@
# Calls: ::tkcon::ExpandBestMatch
# Returns: list containing longest unique match followed by all the
# possible further matches
-##
+##
proc ::tkcon::ExpandVariable str {
if {[regexp {([^\(]*)\((.*)} $str junk ary str]} {
## Looks like they're trying to expand an array.
@@ -4901,7 +4911,7 @@
## or $e is {}. $e is extra for compatibility with proc below.
# ARGS: l - list to find best unique match in
# Returns: longest unique match in the list
-##
+##
proc ::tkcon::ExpandBestMatch2 {l {e {}}} {
set s [lindex $l 0]
if {[llength $l]>1} {
@@ -4921,7 +4931,7 @@
# ARGS: l - list to find best unique match in
# e - currently best known unique match
# Returns: longest unique match in the list
-##
+##
proc ::tkcon::ExpandBestMatch {l {e {}}} {
set ec [lindex $l 0]
if {[llength $l]>1} {
@@ -5285,7 +5295,7 @@
## ::tkcon::Resource - re'source's this script into current console
## Meant primarily for my development of this program. It follows
## links until the ultimate source is found.
-##
+##
set ::tkcon::PRIV(SCRIPT) [info script]
if {!$::tkcon::PRIV(WWW) && [string compare $::tkcon::PRIV(SCRIPT) {}]} {
# we use a catch here because some wrap apps choke on 'file type'
Index: magic.spec
===================================================================
RCS file: /cvs/extras/rpms/magic/FC-6/magic.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- magic.spec 21 Jun 2007 15:17:47 -0000 1.3
+++ magic.spec 8 Jul 2007 07:05:39 -0000 1.4
@@ -1,6 +1,6 @@
Name: magic
Version: 7.4.35
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: A very capable VLSI layout tool
License: GPL
@@ -10,6 +10,7 @@
Source: http://opencircuitdesign.com/%{name}/archive/%{name}-%{version}.tgz
Source1: %{name}.desktop
Patch0: %{name}-verbose.patch
+Patch1: %{name}-%{version}-64bit.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -31,9 +32,9 @@
tools for their product design flow.
%package doc
-Summary: Documentation for magic, A very capable VLSI layout tool
-Group: Documentation
-Requires: %{name} = %{version}-%{release}
+Summary: Documentation for magic, A very capable VLSI layout tool
+Group: Documentation
+Requires: %{name} = %{version}-%{release}
%description doc
@@ -55,6 +56,7 @@
if [ -d %{_prefix}/lib64 ] ; then
SUF=64
+ %patch1 -p0 -b .64bit
else
SUF=
fi
@@ -102,10 +104,10 @@
chmod -x %{buildroot}%{_libdir}/%{name}/tcl/console.tcl
%post
-%{_bindir}/update-desktop-database %{_datadir}/applications || :
+update-desktop-database &> /dev/null || :
%postun
-%{_bindir}/update-desktop-database %{_datadir}/applications || :
+update-desktop-database &> /dev/null || :
%clean
%{__rm} -rf %{buildroot}
@@ -126,6 +128,10 @@
%Changelog
+* Sun Jul 08 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 7.4.35-3
+- fix for 64 bit with respect to a hardcoded autopath
+- fix for %%post and %%postun - #246778
+
* Thu Jun 21 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 7.4.35-2
- fix desktop file #241443
More information about the fedora-extras-commits
mailing list