From 531591c5b64a337862c8b4e6f7d25ba79f850b7c Mon Sep 17 00:00:00 2001
From: Chitlesh GOORAH <chitlesh@fedoraproject.org>
Date: Sun, 15 Oct 2006 13:41:53 +0000
Subject: [PATCH] auto-import ngspice-17-7 on branch devel from
 ngspice-17-7.src.rpm

---
 ngspice-rework-17-spinit.patch | 21 ---------------------
 ngspice.spec                   | 20 ++++++++++----------
 2 files changed, 10 insertions(+), 31 deletions(-)
 delete mode 100644 ngspice-rework-17-spinit.patch

diff --git a/ngspice-rework-17-spinit.patch b/ngspice-rework-17-spinit.patch
deleted file mode 100644
index ca65f43..0000000
--- a/ngspice-rework-17-spinit.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- src/spinit.in	2005-05-10 23:52:58.000000000 +0200
-+++ spinit.in	2006-09-19 21:35:14.000000000 +0200
-@@ -10,13 +10,13 @@
- 
- * For SPICE2 POLYs, edit the below line to point to the location 
- * of your codemode.
--@XSPICEINIT@ codemodel @prefix@/lib/spice/spice2poly.cm
-+@XSPICEINIT@ codemodel @prefix@/lib64/spice/spice2poly.cm
- 
- * The other codemodels
--@XSPICEINIT@ codemodel @prefix@/lib/spice/analog.cm
--@XSPICEINIT@ codemodel @prefix@/lib/spice/digital.cm
--@XSPICEINIT@ codemodel @prefix@/lib/spice/xtradev.cm
--@XSPICEINIT@ codemodel @prefix@/lib/spice/xtraevt.cm
-+@XSPICEINIT@ codemodel @prefix@/lib64/spice/analog.cm
-+@XSPICEINIT@ codemodel @prefix@/lib64/spice/digital.cm
-+@XSPICEINIT@ codemodel @prefix@/lib64/spice/xtradev.cm
-+@XSPICEINIT@ codemodel @prefix@/lib64/spice/xtraevt.cm
- 
- end
- unset __flag
diff --git a/ngspice.spec b/ngspice.spec
index 275c40d..e24cc3f 100644
--- a/ngspice.spec
+++ b/ngspice.spec
@@ -1,6 +1,6 @@
 Name:              ngspice
 Version:           17
-Release:           6%{?dist}
+Release:           7%{?dist}
 Summary:           A mixed level/signal circuit simulator
 
 License:           BSD
@@ -10,8 +10,6 @@ URL:               http://%{name}.sourceforge.net/
 Source0:           http://ovh.dl.sourceforge.net/sourceforge/%{name}/ng-spice-rework-%{version}.tar.gz
 BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch0:            ngspice-rework-17-spinit.patch
-
 BuildRequires:     readline-devel, libXext-devel, libpng-devel, libICE-devel
 BuildRequires:     libXaw-devel, mesa-libGL-devel, libXt-devel
 
@@ -53,12 +51,12 @@ and info format.
 %build
 %ifarch x86_64 sparc64 ppc64 amd64
 %{__cp} -p src/spinit.in src/spinit.in.ngspice
-cat src/spinit.in.ngspice | \
-sed -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/spice2poly.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/spice2poly.cm|\
-    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/analog.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/analog.cm|  \
-    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/digital.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/digital.cm|\
-    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/xtradev.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/xtradev.cm|\
-    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/xtraevt.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/xtraevt.cm|\
+cat src/spinit.in.ngspice | sed \
+    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/spice2poly.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/spice2poly.cm|'\
+    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/analog.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/analog.cm|'  \
+    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/digital.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/digital.cm|'\
+    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/xtradev.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/xtradev.cm|'\
+    -e 's|@XSPICEINIT@ codemodel @prefix@/lib/spice/xtraevt.cm|@XSPICEINIT@ codemodel @prefix@/lib64/spice/xtraevt.cm|'\
 > src/spinit.in
 %endif
 
@@ -124,7 +122,6 @@ fi
 %{_libdir}/spice/
 
 
-
 %files doc
 %defattr(-, root, root, -)
 %doc doc/ examples/ Stuarts_Poly_Notes FAQ
@@ -136,6 +133,9 @@ fi
 
 
 %Changelog
+* Sun Oct 15 2006 Chitlesh Goorah <chitlesh@fedoraproject.org> 17-7
+- Fixed src/spinit.in for 64 bit
+
 * Thu Oct 12 2006 Chitlesh Goorah <chitlesh@fedoraproject.org> 17-6
 - Testing on 64 bit arch