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

Mon Feb 26 19:16:07 UTC 2007

Author: chitlesh

Update of /cvs/extras/rpms/magic/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7388/FC-6

Modified Files:
	.cvsignore sources 
Added Files:
	magic-7.4.33-verbose.patch magic.desktop magic.spec 
Log Message:
auto-import magic-7.4.33-6 on branch FC-6 from magic-7.4.33-6.src.rpm

magic-7.4.33-verbose.patch:

--- NEW FILE magic-7.4.33-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


--- NEW FILE magic.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Magic VLSI
Exec=magic
Icon=gnome-util.png
Type=Application
Terminal=false
GenericName=Magic
Categories=Qt;KDE;Education;Science;
X-Desktop-File-Install-Version=0.10
Comment=VLSI layout tool

--- NEW FILE magic.spec ---
Name:             magic
Version:          7.4.33
Release:          6%{?dist}
Summary:          A very capable VLSI layout tool

License:          GPL
Group:            Applications/Engineering
URL:              http://opencircuitdesign.com/%{name}/index.html

Source:           http://opencircuitdesign.com/%{name}/archive/%{name}-%{version}.tgz
Source1:          %{name}.desktop
Patch0:           %{name}-%{version}-verbose.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

%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
popular with universities and small companies.

Magic is widely cited as being the easiest tool to use for
circuit layout, even for people who ultimately rely on commercial
tools for their product design flow.

%package doc
Summary:           Documentation for magic, A very capable VLSI layout tool
Group:             Documentation
Requires:          %{name} = %{version}


%description doc
This package contains the documentation of magic in the postscript
and some tutorials.


%prep
# tarball includes unneeded symlink, so we firstly
# 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

%patch0 -p0 -b .verbose

%build

if [ -d %{_prefix}/lib64 ] ; then
   SUF=64
else
   SUF=
fi

WISH=%{_bindir}/wish
export 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

scripts/makedbh database/database.h.in database/database.h

%{__make} %{?_smp_mflags}

%install
%{__rm} -rf %{buildroot}

cd %{name}-%{version}
%{__make} install \
    DESTDIR=%{buildroot} \
    INSTALL="%{__install} -c -p" \
    CP="%{__cp} -p"

desktop-file-install --vendor ""                \
    --add-category "Engineering"                \
    --dir %{buildroot}%{_datadir}/applications/ \
    %{SOURCE1}

# applying timestamps
%{__cp} -p README* TODO VERSION ..

%{__mkdir} -p %{buildroot}%{_docdir}/%{name}-%{version}

%{__cp} -pr %{buildroot}%{_libdir}/%{name}/{doc/,tutorial} ..
%{__rm} -rf %{buildroot}%{_libdir}/%{name}/{doc/,tutorial}

chmod -x %{buildroot}%{_libdir}/%{name}/tcl/console.tcl

%clean
%{__rm} -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc README* TODO VERSION
%{_bindir}/%{name}
%{_bindir}/spice2sim
%{_libdir}/%{name}/
%{_mandir}/man?/*
%{_datadir}/applications/%{name}.desktop

%files doc
%doc doc/ tutorial/
%defattr(-, root, root, -)

%Changelog
* Wed Feb 22 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 7.4.33-6
- Fixed shebang

* Mon Feb 05 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 7.4.33-5
- fixed documentation locations

* Sat Feb 03 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 7.4.33-4
- CFLAGS fix improved
- tarball includes unneeded symlink, firstly create a directory and expand tarball there.
- added timestamps support

* Thu Feb 01 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 7.4.33-3
- fix for CFLAGS

* Sat Jan 20 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 7.4.33-2
- Fix presence of magic in gnome menu

* Fri Jan 19 2007 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 7.4.33-1
- Initial package for Fedora Extras.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/magic/FC-6/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Feb 2007 18:30:09 -0000	1.1
+++ .cvsignore	26 Feb 2007 19:15:34 -0000	1.2
@@ -0,0 +1 @@
+magic-7.4.33.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/magic/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Feb 2007 18:30:09 -0000	1.1
+++ sources	26 Feb 2007 19:15:34 -0000	1.2
@@ -0,0 +1 @@
+f35f93bdb9ae3842879d52e08c6d7ace  magic-7.4.33.tgz


