rpms/magic/devel .cvsignore, 1.10, 1.11 import.log, 1.4, 1.5 magic.desktop, 1.4, 1.5 magic.spec, 1.17, 1.18 sources, 1.10, 1.11

[Chitlesh GOORAH]

Author: chitlesh

Update of /cvs/pkgs/rpms/magic/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16779/devel

Modified Files:
	.cvsignore import.log magic.desktop magic.spec sources 
Log Message:
8.0 series introduced


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/magic/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	6 Jan 2009 23:54:55 -0000	1.10
+++ .cvsignore	2 Aug 2009 23:00:09 -0000	1.11
@@ -1 +1 @@
-magic-7.5.169.tgz
+magic-8.0.51.tgz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/magic/devel/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	6 Jan 2009 23:54:55 -0000	1.4
+++ import.log	2 Aug 2009 23:00:09 -0000	1.5
@@ -2,3 +2,4 @@ magic-7_5_146-1_fc8:HEAD:magic-7.5.146-1
 magic-7_5_147-1_fc9:HEAD:magic-7.5.147-1.fc9.src.rpm:1220001384
 magic-7_5_168-1_fc10:HEAD:magic-7.5.168-1.fc10.src.rpm:1230565927
 magic-7_5_169-1_fc10:HEAD:magic-7.5.169-1.fc10.src.rpm:1231286025
+magic-8_0_51-1_fc11:HEAD:magic-8.0.51-1.fc11.src.rpm:1249253896


Index: magic.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/magic/devel/magic.desktop,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- magic.desktop	24 Aug 2007 11:54:20 -0000	1.4
+++ magic.desktop	2 Aug 2009 23:00:09 -0000	1.5
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Categories=Science;Engineering;
+Categories=Electronics;Engineering;
 Comment=VLSI layout tool
 Encoding=UTF-8
 Exec=magic


Index: magic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/magic/devel/magic.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- magic.spec	25 Jul 2009 11:38:28 -0000	1.17
+++ magic.spec	2 Aug 2009 23:00:10 -0000	1.18
@@ -1,6 +1,6 @@
 Name:             magic
-Version:          7.5.169
-Release:          3%{?dist}
+Version:          8.0.51
+Release:          1%{?dist}
 Summary:          A very capable VLSI layout tool
 
 License:          GPLv2
@@ -23,10 +23,7 @@ Requires:         tcsh
 Requires:         electronics-menu
 
 %description
-Magic is a venerable VLSI layout tool, written in the 1980's at
-Berkeley by John Ousterhout, now famous primarily for writing
-the scripting interpreter language Tcl. Due largely in part to
-its liberal Berkeley open-source license, magic has remained
+Magic is a venerable VLSI layout tool. Magic VLSI remains
 popular with universities and small companies.
 
 Magic is widely cited as being the easiest tool to use for
@@ -49,6 +46,7 @@ and some tutorials.
 # create a directory and expand tarball there.
 %setup -q -T -c %{name}-%{version} -a 0
 
+
 cd %{name}-%{version}
 %{__sed} -i.cflags -e 's|CFLAGS=.*CFLAGS|:|' configure
 
@@ -61,26 +59,29 @@ sed -i "s|package require -exact|package
 %patch1 -p0 -b .64bit
 %endif
 
+#*** ERROR: No build ID note found in /usr/lib/magic/tcl/magicexec
+#export LDDLFLAGS="$LDDLFLAGS --build-id"
+
+
 %build
 
-if [ -d %{_prefix}/lib64 ] ; then
-   SUF=64
-else
-   SUF=
-fi
+#if [ -d %{_prefix}/lib64 ] ; then
+#   SUF=64
+#else
+#   SUF=
+#fi
 
-WISH=%{_bindir}/wish
-export WISH
+export WISH=%{_bindir}/wish
 
 cd %{name}-%{version}
 
-%configure \
-   --with-tcl=%{_prefix}/lib$SUF     \
-   --with-tk=%{_prefix}/lib$SUF      \
-   --with-tcllibs=%{_prefix}/lib$SUF \
-   --with-tklibs=%{_prefix}/lib$SUF
+%configure --with-gnu-ld\
+   --with-tcl=%{_libdir}     \
+   --with-tk=%{_libdir}      \
+   --with-tcllibs=%{_libdir} \
+   --with-tklibs=%{_libdir}
 
-scripts/makedbh database/database.h.in database/database.h
+#scripts/makedbh database/database.h.in database/database.h
 
 %{__make} %{?_smp_mflags}
 
@@ -93,10 +94,7 @@ cd %{name}-%{version}
     INSTALL="%{__install} -c -p" \
     CP="%{__cp} -p"
 
-desktop-file-install --vendor fedora            \
-    --add-category "Engineering"                \
-    --add-category "Electronics"                \
-    --remove-category  "Science"                \
+desktop-file-install --vendor ""                \
     --dir %{buildroot}%{_datadir}/applications/ \
     %{SOURCE1}
 
@@ -139,7 +137,7 @@ update-desktop-database &> /dev/null || 
 %{_bindir}/ext2spice
 %{_libdir}/%{name}/
 %{_mandir}/man?/*
-%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/128x128/apps/%{name}.png
 
 %files doc


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/magic/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	6 Jan 2009 23:54:55 -0000	1.10
+++ sources	2 Aug 2009 23:00:10 -0000	1.11
@@ -1 +1 @@
-7dbff03416d89a51b33384cd9d632723  magic-7.5.169.tgz
+7a289a4d8ba6cc1b79774dcea7ac264e  magic-8.0.51.tgz