- removed two lines with define

[packages/electric.git] / electric.spec

diff --git a/electric.spec b/electric.spec
index 0103be1361a6f3d9fe3995dd4bc6e88f8e4b3396..4de67ab68720c452f9f28f2bad26ac0eb8e90def 100644 (file)
--- a/electric.spec
+++ b/electric.spec
@@ -1,16 +1,16 @@
 Summary:       Electric VLSI Design System
 Summary(pl):   System projektowania uk³adów VLSI
 Name:          electric
-Version:       6.01
-Release:       3
+Version:       6.06
+Release:       2
 License:       GPL v2
 Vendor:                Static Free Software
 Group:         Applications/Engineering
-Group(de):     Applikationen/Ingenieurwesen
-Group(pl):     Aplikacje/In¿ynierskie
 Source0:       ftp://ftp.gnu.org/pub/gnu/electric/%{name}-%{version}.tar.gz
 Patch0:                %{name}-datadir.patch
 Patch1:                %{name}-tcl.patch
+Patch2:                %{name}-makefile.patch
+Patch3:                %{name}-ac_fix.patch
 URL:           http://www.staticfreesoft.com/electric.html
 BuildRequires: autoconf
 BuildRequires: automake
@@ -18,7 +18,6 @@ BuildRequires:        lesstif-devel
 BuildRequires: tcl-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define        _prefix /usr/X11R6
 
 %description
 Electric designs MOS and bipolar integrated circuits,
@@ -41,20 +40,22 @@ VHDL, CIF i GDS II.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
+#%patch0 -p1
+#%patch1 -p1
+%patch2
+%patch3
 
 %build
-aclocal
-autoconf
+%{__aclocal}
+%{__autoconf}
 %configure
 
-%{__make} DEBUG="%{rpmcflags} -Wall"
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/electric} 
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/electric}
 install electric $RPM_BUILD_ROOT%{_bindir}
 install lib/.cadrc $RPM_BUILD_ROOT%{_datadir}/electric
 install lib/*.help $RPM_BUILD_ROOT%{_datadir}/electric
@@ -64,14 +65,12 @@ install lib/*.txt $RPM_BUILD_ROOT%{_datadir}/electric
 # can't find better way to make electric find tcl.init
 ln -sf /usr/lib/tcl8.* $RPM_BUILD_ROOT%{_datadir}/electric/tcl
 
-gzip -9nf ChangeLog README examples/samples.txt
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc *.gz html/manual examples
+%doc ChangeLog README examples/samples.txt html/manual examples
 %attr(755,root,root) %{_bindir}/*
 %dir %{_datadir}/electric
 %{_datadir}/electric/*