rpms/ngspice/FC-5 ngspice-rework-17-spinit.patch, NONE, 1.1 ngspice.spec, 1.2, 1.3
Chitlesh GOORAH (chitlesh)
fedora-extras-commits at redhat.com
Thu Oct 12 18:45:08 UTC 2006
Author: chitlesh
Update of /cvs/extras/rpms/ngspice/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1394/FC-5
Modified Files:
ngspice.spec
Added Files:
ngspice-rework-17-spinit.patch
Log Message:
auto-import ngspice-17-6 on branch FC-5 from ngspice-17-6.src.rpm
ngspice-rework-17-spinit.patch:
--- NEW FILE ngspice-rework-17-spinit.patch ---
--- 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.
- at XSPICEINIT@ codemodel @prefix@/lib/spice/spice2poly.cm
+ at XSPICEINIT@ codemodel @prefix@/lib64/spice/spice2poly.cm
* The other codemodels
- at XSPICEINIT@ codemodel @prefix@/lib/spice/analog.cm
- at XSPICEINIT@ codemodel @prefix@/lib/spice/digital.cm
- at XSPICEINIT@ codemodel @prefix@/lib/spice/xtradev.cm
- at XSPICEINIT@ codemodel @prefix@/lib/spice/xtraevt.cm
+ at XSPICEINIT@ codemodel @prefix@/lib64/spice/analog.cm
+ at XSPICEINIT@ codemodel @prefix@/lib64/spice/digital.cm
+ at XSPICEINIT@ codemodel @prefix@/lib64/spice/xtradev.cm
+ at XSPICEINIT@ codemodel @prefix@/lib64/spice/xtraevt.cm
end
unset __flag
Index: ngspice.spec
===================================================================
RCS file: /cvs/extras/rpms/ngspice/FC-5/ngspice.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ngspice.spec 4 Sep 2006 08:54:15 -0000 1.2
+++ ngspice.spec 12 Oct 2006 18:45:08 -0000 1.3
@@ -1,6 +1,6 @@
Name: ngspice
Version: 17
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: A mixed level/signal circuit simulator
License: BSD
@@ -10,6 +10,8 @@
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
@@ -49,6 +51,17 @@
%setup -q -n ng-spice-rework-%{version}
%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|\
+> src/spinit.in
+%endif
+
%configure \
--enable-cider \
--enable-dot-global \
@@ -57,7 +70,10 @@
--enable-xgraph \
--enable-xspice \
--with-x=yes \
- --with-readline=yes
+ --with-readline=yes \
+%ifarch x86_64 sparc64 ppc64 amd64
+ --enable-libsuffix=64 \
+%endif
# make in xgraph with another flag first so
# that we can correctly use Fedora compiler flags.
@@ -73,7 +89,7 @@
chmod 644 src/frontend/*.{c,h}
chmod 644 src/include/*.h
-make install DESTDIR=%{buildroot}
+%{__make} install DESTDIR=%{buildroot}
%{__rm} -f doc/Makefile*
%{__rm} -f doc/ngspice.info*
@@ -81,7 +97,7 @@
rm -f %{buildroot}%{_libdir}/ng-spice-rework/libbsim4.a
%clean
-rm -rf %{buildroot}
+%{__rm} -rf %{buildroot}
%post doc
/sbin/install-info --quiet --info-dir=%{_infodir}/dir %{_infodir}/%{name}.info.gz >/dev/null 2>&1
@@ -104,15 +120,9 @@
%{_bindir}/ngsconvert
%{_bindir}/%{name}
%{_bindir}/xgraph
-%dir %{_datadir}/ng-spice-rework
-%{_datadir}/ng-spice-rework/helpdir
-%{_datadir}/ng-spice-rework/scripts
-%dir %{_libdir}/spice/
-%{_libdir}/spice/analog.cm
-%{_libdir}/spice/digital.cm
-%{_libdir}/spice/spice2poly.cm
-%{_libdir}/spice/xtradev.cm
-%{_libdir}/spice/xtraevt.cm
+%{_datadir}/ng-spice-rework
+%{_libdir}/spice/
+
%files doc
@@ -126,6 +136,9 @@
%Changelog
+* Thu Oct 12 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> 17-6
+- Testing on 64 bit arch
+
* Mon Sep 04 2006 Chitlesh Goorah <chitlesh at fedoraproject.org> 17-5
- Added libXt-devel to include X headers
More information about the scm-commits
mailing list