rpms/magic/devel .cvsignore, 1.4, 1.5 magic.spec, 1.9, 1.10 sources, 1.4, 1.5

[Thibault North (tnorth)]

Author: tnorth

Update of /cvs/pkgs/rpms/magic/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8951/devel

Modified Files:
	.cvsignore magic.spec sources 
Log Message:
New upstream release and fix for current Tk version




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/magic/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	9 Feb 2008 11:58:58 -0000	1.4
+++ .cvsignore	8 Apr 2008 18:24:33 -0000	1.5
@@ -1 +1 @@
-magic-7.5.116.tgz
+magic-7.5.129.tgz


Index: magic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/magic/devel/magic.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- magic.spec	9 Feb 2008 11:58:58 -0000	1.9
+++ magic.spec	8 Apr 2008 18:24:33 -0000	1.10
@@ -1,5 +1,5 @@
 Name:             magic
-Version:          7.5.116
+Version:          7.5.129
 Release:          1%{?dist}
 Summary:          A very capable VLSI layout tool
 
@@ -19,6 +19,8 @@
 BuildRequires:    desktop-file-utils tk-devel mesa-libGLw-devel mesa-libGL-devel m4
 
 Requires:         tcsh
+# Special FEL Gnome/KDE menu structure
+Requires:         electronics-menu
 
 %description
 Magic is a venerable VLSI layout tool, written in the 1980's at
@@ -51,6 +53,7 @@
 %{__sed} -i.cflags -e 's|CFLAGS=.*CFLAGS|:|' configure
 
 sed -i "s|/usr/local/bin/tclsh|%{_bindir}/tclsh|" tcltk/strip_reflibs.tcl
+sed -i "s|package require -exact|package require|" tcltk/tkcon.tcl
 
 %patch0 -p0 -b .verbose
 
@@ -92,6 +95,7 @@
 
 desktop-file-install --vendor fedora            \
     --add-category "Engineering"                \
+    --remove-category  "Science"		\
     --dir %{buildroot}%{_datadir}/applications/ \
     %{SOURCE1}
 
@@ -141,6 +145,11 @@
 
 
 %Changelog
+* Sun Apr 08 2008 Thibault North <tnorth [AT] fedoraproject DOT org>  -  7.5.129-1
+- new upstream release
+- opting the FEL relating menu structure
+- Fixed compilation for current Tk version
+
 * Fri Feb 08 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 7.5.116-1
 - new upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/magic/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 Feb 2008 11:58:58 -0000	1.4
+++ sources	8 Apr 2008 18:24:33 -0000	1.5
@@ -1 +1 @@
-fa3c4799e6554791f14d359f4b5e98bc  magic-7.5.116.tgz
+a1afba13ac1c2cb40575b54783f47abd  magic-7.5.129.tgz