rpms/magic/devel magic-verbose.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 magic.desktop, 1.1, 1.2 magic.spec, 1.1, 1.2 sources, 1.2, 1.3 magic-7.4.33-verbose.patch, 1.1, NONE

[Chitlesh GOORAH (chitlesh)]

Author: chitlesh

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

Modified Files:
	.cvsignore magic.desktop magic.spec sources 
Added Files:
	magic-verbose.patch 
Removed Files:
	magic-7.4.33-verbose.patch 
Log Message:


magic-verbose.patch:

--- NEW FILE magic-verbose.patch ---
--- magic-7.4.33/Makefile	2006-06-14 09:12:44.000000000 +0200
+++ Makefile	2007-02-05 12:26:05.000000000 +0100
@@ -18,12 +18,10 @@
 all:	$(ALL_TARGET)
 
 standard:
-	@echo --- errors and warnings logged in file make.log
-	@${MAKE} mains 2>&1 | tee -a make.log | egrep -i "(.c:|Stop.|---)"
+	@${MAKE} mains
 
 tcl:
-	@echo --- errors and warnings logged in file make.log
-	@${MAKE} tcllibrary 2>&1 | tee -a make.log | egrep -i "(.c:|Stop.|---)"
+	@${MAKE} tcllibrary
 
 force: clean all
 
@@ -124,6 +122,6 @@
 	${RM} tags
 	find . ${MODULES} ${PROGRAMS} -name "*.[ch]" -maxdepth 1 | xargs ctags -o tags
 
-TAGS: 
+TAGS:
 	${RM} TAGS
 	find . ${MODULES} ${PROGRAMS} -name "*.[ch]" -maxdepth 1 | xargs etags -o TAGS


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/magic/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Feb 2007 19:29:39 -0000	1.2
+++ .cvsignore	24 Apr 2007 09:10:56 -0000	1.3
@@ -1 +1 @@
-magic-7.4.33.tgz
+magic-7.4.35.tgz


Index: magic.desktop
===================================================================
RCS file: /cvs/extras/rpms/magic/devel/magic.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- magic.desktop	26 Feb 2007 19:29:39 -0000	1.1
+++ magic.desktop	24 Apr 2007 09:10:56 -0000	1.2
@@ -1,11 +1,17 @@
 [Desktop Entry]
+Categories=Qt;KDE;Education;Science;Engineering;
+Comment=VLSI layout tool
 Encoding=UTF-8
-Name=Magic VLSI
-Exec=magic
+Exec=magic -d OGL
+GenericName=Magic
 Icon=gnome-util.png
+MimeType=application/mag
+Name=Magic VLSI
+Path=
+StartupNotify=true
+Terminal=0
+TerminalOptions=
 Type=Application
-Terminal=false
-GenericName=Magic
-Categories=Qt;KDE;Education;Science;
 X-Desktop-File-Install-Version=0.10
-Comment=VLSI layout tool
\ No newline at end of file
+X-KDE-SubstituteUID=false
+X-KDE-Username=


Index: magic.spec
===================================================================
RCS file: /cvs/extras/rpms/magic/devel/magic.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- magic.spec	26 Feb 2007 19:29:39 -0000	1.1
+++ magic.spec	24 Apr 2007 09:10:56 -0000	1.2
@@ -1,6 +1,6 @@
 Name:             magic
-Version:          7.4.33
-Release:          6%{?dist}
+Version:          7.4.35
+Release:          1%{?dist}
 Summary:          A very capable VLSI layout tool
 
 License:          GPL
@@ -9,7 +9,7 @@
 
 Source:           http://opencircuitdesign.com/%{name}/archive/%{name}-%{version}.tgz
 Source1:          %{name}.desktop
-Patch0:           %{name}-%{version}-verbose.patch
+Patch0:           %{name}-verbose.patch
 
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -78,8 +78,8 @@
 %{__rm} -rf %{buildroot}
 
 cd %{name}-%{version}
-%{__make} install \
-    DESTDIR=%{buildroot} \
+%{__make} install                \
+    DESTDIR=%{buildroot}         \
     INSTALL="%{__install} -c -p" \
     CP="%{__cp} -p"
 
@@ -98,6 +98,12 @@
 
 chmod -x %{buildroot}%{_libdir}/%{name}/tcl/console.tcl
 
+%post
+%{_bindir}/update-desktop-database %{_datadir}/applications || :
+
+%postun
+%{_bindir}/update-desktop-database %{_datadir}/applications || :
+
 %clean
 %{__rm} -rf %{buildroot}
 
@@ -115,7 +121,12 @@
 %doc doc/ tutorial/
 %defattr(-, root, root, -)
 
+
 %Changelog
+* Wed Feb 22 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 7.4.35-1
+- New upstream release
+- added mimetype
+
 * Wed Feb 22 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 7.4.33-6
 - Fixed shebang
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/magic/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Feb 2007 19:29:39 -0000	1.2
+++ sources	24 Apr 2007 09:10:56 -0000	1.3
@@ -1 +1 @@
-f35f93bdb9ae3842879d52e08c6d7ace  magic-7.4.33.tgz
+5d707f32932b2bbe02900377c66b0e8c  magic-7.4.35.tgz


--- magic-7.4.33-verbose.patch DELETED ---