rpms/magic/F-7 magic.png, NONE, 1.1 .cvsignore, 1.3, 1.4 magic.desktop, 1.3, 1.4 magic.spec, 1.6, 1.7 sources, 1.3, 1.4

[Chitlesh GOORAH (chitlesh)]

Author: chitlesh

Update of /cvs/pkgs/rpms/magic/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14461/F-7

Modified Files:
	.cvsignore magic.desktop magic.spec sources 
Added Files:
	magic.png 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/magic/F-7/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	24 Apr 2007 09:10:56 -0000	1.3
+++ .cvsignore	9 Feb 2008 11:44:52 -0000	1.4
@@ -1 +1 @@
-magic-7.4.35.tgz
+magic-7.5.116.tgz


Index: magic.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/magic/F-7/magic.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- magic.desktop	21 Jun 2007 15:19:29 -0000	1.3
+++ magic.desktop	9 Feb 2008 11:44:52 -0000	1.4
@@ -1,17 +1,13 @@
 [Desktop Entry]
-Categories=Qt;KDE;Education;Science;Engineering;
+Categories=Science;Engineering;
 Comment=VLSI layout tool
 Encoding=UTF-8
 Exec=magic
 GenericName=Magic
-Icon=gnome-util.png
+Icon=magic.png
 MimeType=application/mag
-Name=Magic VLSI
-Path=
+Name=Magic VLSI Layout
 StartupNotify=true
-Terminal=0
-TerminalOptions=
+Terminal=false
 Type=Application
-X-Desktop-File-Install-Version=0.10
-X-KDE-SubstituteUID=false
-X-KDE-Username=
+


Index: magic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/magic/F-7/magic.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- magic.spec	8 Jul 2007 08:17:02 -0000	1.6
+++ magic.spec	9 Feb 2008 11:44:52 -0000	1.7
@@ -1,24 +1,24 @@
 Name:             magic
-Version:          7.4.35
-Release:          5%{?dist}
+Version:          7.5.116
+Release:          1%{?dist}
 Summary:          A very capable VLSI layout tool
 
-License:          GPL
+License:          GPLv2
 Group:            Applications/Engineering
 URL:              http://opencircuitdesign.com/%{name}/index.html
 
 Source:           http://opencircuitdesign.com/%{name}/archive/%{name}-%{version}.tgz
 Source1:          %{name}.desktop
+Source2:          %{name}.png
 Patch0:           %{name}-verbose.patch
-Patch1:           %{name}-%{version}-64bit.patch
+Patch1:           %{name}-7.4.35-64bit.patch
 
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:    libXi-devel libXmu-devel libXext-devel mesa-libGLU-devel blt tcsh
 BuildRequires:    desktop-file-utils tk-devel mesa-libGLw-devel mesa-libGL-devel m4
 
-# due to no upstream icon for magic
-Requires:         redhat-artwork tcsh
+Requires:         tcsh
 
 %description
 Magic is a venerable VLSI layout tool, written in the 1980's at
@@ -50,6 +50,8 @@
 cd %{name}-%{version}
 %{__sed} -i.cflags -e 's|CFLAGS=.*CFLAGS|:|' configure
 
+sed -i "s|/usr/local/bin/tclsh|%{_bindir}/tclsh|" tcltk/strip_reflibs.tcl
+
 %patch0 -p0 -b .verbose
 
 %ifarch x86_64 sparc64 ppc64 amd64
@@ -89,13 +91,12 @@
     CP="%{__cp} -p"
 
 desktop-file-install --vendor fedora            \
-    --add-category X-Fedora                     \
     --add-category "Engineering"                \
     --dir %{buildroot}%{_datadir}/applications/ \
     %{SOURCE1}
 
 # applying timestamps
-%{__cp} -p README* TODO VERSION ..
+%{__cp} -pr README* TODO VERSION scmos/ ..
 
 %{__mkdir} -p %{buildroot}%{_docdir}/%{name}-%{version}
 
@@ -106,10 +107,18 @@
 
 chmod -x %{buildroot}%{_libdir}/%{name}/tcl/console.tcl
 
+%{__mkdir} -p %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/
+%{__cp} -p %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
+
+
 %post
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 update-desktop-database &> /dev/null || :
 
 %postun
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 update-desktop-database &> /dev/null || :
 
 %clean
@@ -124,13 +133,20 @@
 %{_libdir}/%{name}/
 %{_mandir}/man?/*
 %{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
 
 %files doc
-%doc doc/ tutorial/
+%doc doc/ tutorial/ scmos/
 %defattr(-, root, root, -)
 
 
 %Changelog
+* Fri Feb 08 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 7.5.116-1
+- new upstream release
+
+* Fri Aug 24 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 7.4.35-6
+- mass rebuild for fedora 8 - ppc
+
 * Sun Jul 08 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 7.4.35-5
 - patching properly
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/magic/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	24 Apr 2007 09:10:56 -0000	1.3
+++ sources	9 Feb 2008 11:44:52 -0000	1.4
@@ -1 +1 @@
-5d707f32932b2bbe02900377c66b0e8c  magic-7.4.35.tgz
+fa3c4799e6554791f14d359f4b5e98bc  magic-7.5.116.tgz