diff --git a/_link.disabled b/_link.disabled deleted file mode 100644 index 25c5582..0000000 --- a/_link.disabled +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/gnucap-0.34-debian.patch b/gnucap-0.34-debian.patch index f9caad8..dae2521 100644 --- a/gnucap-0.34-debian.patch +++ b/gnucap-0.34-debian.patch @@ -213,38 +213,3 @@ }else{ delete m; file.warn(0, "what's this??"); ---- gnucap-0.35/examples/runall.debian 2000-09-05 06:22:00.000000000 +0200 -+++ gnucap-0.35/examples/runall 2007-02-14 13:04:05.000000000 +0100 -@@ -1,16 +1,16 @@ --# --$1 -b eq2-145.ckt --$1 -b eq2-289.ckt --$1 -b eq2-577.ckt --$1 -b eq3-1153.ckt --$1 -b eq4-2305.ckt --$1 -b eqboost.ckt --$1 -b eqflat.ckt --$1 -b eqmodify.ckt --$1 -b killzap.ckt --$1 -b nmos100.ckt --$1 -b nmos18.ckt --$1 -b nmos30.ckt --$1 -b nmp100.ckt --$1 -b opamp-ol.ckt --$1 -b opamp-vf.ckt -+#!/bin/sh -+gnucap -b eq2-145.ckt -+gnucap -b eq2-289.ckt -+gnucap -b eq2-577.ckt -+gnucap -b eq3-1153.ckt -+gnucap -b eq4-2305.ckt -+gnucap -b eqboost.ckt -+gnucap -b eqflat.ckt -+gnucap -b eqmodify.ckt -+gnucap -b killzap.ckt -+gnucap -b nmos100.ckt -+gnucap -b nmos18.ckt -+gnucap -b nmos30.ckt -+gnucap -b nmp100.ckt -+gnucap -b opamp-ol.ckt -+gnucap -b opamp-vf.ckt diff --git a/gnucap-docpath.patch b/gnucap-docpath.patch new file mode 100644 index 0000000..19c621a --- /dev/null +++ b/gnucap-docpath.patch @@ -0,0 +1,52 @@ +Index: doc/Makefile.am +=================================================================== +--- doc/Makefile.am.orig ++++ doc/Makefile.am +@@ -3,7 +3,7 @@ + + dist_man_MANS= gnucap.1 + +-pkgdocsdir= ${pkgdatadir}/doc ++pkgdocsdir= ${docdir} + dist_pkgdocs_DATA= \ + acs-tutorial COPYING history INSTALL relnotes.029 \ + relnotes.030 relnotes.031 relnotes.032 relnotes.033 \ +Index: doc/Makefile.in +=================================================================== +--- doc/Makefile.in.orig ++++ doc/Makefile.in +@@ -152,7 +152,7 @@ sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ + dist_man_MANS = gnucap.1 +-pkgdocsdir = ${pkgdatadir}/doc ++pkgdocsdir = ${docdir} + dist_pkgdocs_DATA = \ + acs-tutorial COPYING history INSTALL relnotes.029 \ + relnotes.030 relnotes.031 relnotes.032 relnotes.033 \ +Index: examples/Makefile.am +=================================================================== +--- examples/Makefile.am.orig ++++ examples/Makefile.am +@@ -1,7 +1,7 @@ + ## $Id$ + ## + +-pkgexamplesdir= ${pkgdatadir}/examples ++pkgexamplesdir= ${docdir}/examples + dist_pkgexamples_DATA= ${EXFILES} + + EXFILES= \ +Index: examples/Makefile.in +=================================================================== +--- examples/Makefile.in.orig ++++ examples/Makefile.in +@@ -148,7 +148,7 @@ sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-pkgexamplesdir = ${pkgdatadir}/examples ++pkgexamplesdir = ${docdir}/examples + dist_pkgexamples_DATA = ${EXFILES} + EXFILES = \ + eq2-145.ckt eq2-289.ckt eq2-577.ckt eq3-1153.ckt eq4-2305.ckt \ diff --git a/gnucap-fix_runall.patch b/gnucap-fix_runall.patch new file mode 100644 index 0000000..0f0a191 --- /dev/null +++ b/gnucap-fix_runall.patch @@ -0,0 +1,37 @@ +Index: examples/runall +=================================================================== +--- examples/runall.orig ++++ examples/runall +@@ -1,16 +1,16 @@ +-# +-$1 -b eq2-145.ckt +-$1 -b eq2-289.ckt +-$1 -b eq2-577.ckt +-$1 -b eq3-1153.ckt +-$1 -b eq4-2305.ckt +-$1 -b eqboost.ckt +-$1 -b eqflat.ckt +-$1 -b eqmodify.ckt +-$1 -b killzap.ckt +-$1 -b nmos100.ckt +-$1 -b nmos18.ckt +-$1 -b nmos30.ckt +-$1 -b nmp100.ckt +-$1 -b opamp-ol.ckt +-$1 -b opamp-vf.ckt ++#/bin/bash ++gnucap -b eq2-145.ckt ++gnucap -b eq2-289.ckt ++gnucap -b eq2-577.ckt ++gnucap -b eq3-1153.ckt ++gnucap -b eq4-2305.ckt ++gnucap -b eqboost.ckt ++gnucap -b eqflat.ckt ++gnucap -b eqmodify.ckt ++gnucap -b killzap.ckt ++gnucap -b nmos100.ckt ++gnucap -b nmos18.ckt ++gnucap -b nmos30.ckt ++gnucap -b nmp100.ckt ++gnucap -b opamp-ol.ckt ++gnucap -b opamp-vf.ckt diff --git a/gnucap-modelgen.1 b/gnucap-modelgen.1 new file mode 100644 index 0000000..a442414 --- /dev/null +++ b/gnucap-modelgen.1 @@ -0,0 +1,13 @@ +.TH GNUCAP-MODELGEN 1 "Jun 26, 2012" +.SH NAME +gnucap-modelgen \- Creates mathematical models +.SH SYNOPSIS +.B gnucap-modelgen +.RI " " +.br +.SH DESCRIPTION +\fBgnucap-modelgen\fP creates mathematical models from *.ckt files. +.SH OPTIONS +This program only allows a filename as option. +.SH AUTHOR +This manual page was written by Lars Vogdt .. diff --git a/gnucap.changes b/gnucap.changes index 2ae6275..2ecfda4 100644 --- a/gnucap.changes +++ b/gnucap.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Jun 26 10:29:17 UTC 2012 - lars@linux-schulserver.de + +- beautify specfile +- move documentation and examples to the default places in openSUSE: + gnucap-docpath.patch +- split out runall patch +- added gnucap-modelgen manpage + ------------------------------------------------------------------- Thu Oct 9 00:13:57 CEST 2008 - lars@linux-schulserver.de diff --git a/gnucap.spec b/gnucap.spec index 7d093b1..891b3d1 100644 --- a/gnucap.spec +++ b/gnucap.spec @@ -1,37 +1,57 @@ # # spec file for package gnucap # -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # - Name: gnucap -Summary: Gnucap is the Gnu Circuit Analysis Package Version: 0.35 Release: 10 -License: GPL +License: GPL-2.0+ +Summary: Gnu Circuit Analysis Package +Url: http://www.gnu.org/software/gnucap/ Group: Productivity/Scientific/Electronics -Url: http://www.geda.seul.org/tools/gnucap -Vendor: openSUSE-Education -Source: http://www.gnucap.org/dist/%name-%version.tar.bz2 +Source: http://www.gnucap.org/dist/%{name}-%{version}.tar.bz2 +Source1: gnucap-modelgen.1 +# PATCH-FIX-UPSTREAM -- fix build with GCC 4.3 Patch1: gnucap-0.35-gcc43.patch +# PATCH-FIX-UPSTREAM -- ACS -> Gnucap Patch2: gnucap-0.34-debian.patch -BuildRequires: gcc-c++ libpng-devel readline-devel +# PATCH-FIX-OPENSUSE -- move documentation and example to the standard directories +Patch3: gnucap-docpath.patch +# PATCH-FIX-OPENSUSE -- from Debian: add shebang, and explicitly call gnucap +Patch4: gnucap-fix_runall.patch +BuildRequires: gcc-c++ +BuildRequires: libpng-devel BuildRequires: ncurses-devel +BuildRequires: readline-devel %if 0%{?suse_version} %if 0%{?suse_version} > 1020 -BuildRequires: texlive-devel texlive-latex +BuildRequires: texlive-devel +BuildRequires: texlive-latex %else -BuildRequires: te_latex tetex +BuildRequires: te_latex +BuildRequires: tetex %endif %endif %if 0%{?mandriva_version} -BuildRequires: tetex-latex tetex +BuildRequires: tetex +BuildRequires: tetex-latex %endif BuildRoot: %{_tmppath}/%{name}-%{version}-build -%description +%description The primary component is a general purpose circuit simulator. It performs nonlinear dc and transient analyses, fourier analysis, and ac analysis. Spice compatible models for the MOSFET (level 1-7), BJT, and @@ -44,34 +64,37 @@ Unlike Spice, the engine is designed to do true mixed-mode simulation. Most of the code is in place for future support of event driven analog simulation, and true multi-rate simulation. - %prep %setup -q # use ncurses instead of termcap sed -i 's/-ltermcap/-lncurses/g' configure %patch1 -p1 %patch2 -p1 +%patch3 -p0 +%patch4 -p0 +rm INSTALL %build -%configure -%{__make} %{?jobs:-j%jobs} +%configure --docdir=%{_defaultdocdir}/%{name} +make %{?_smp_mflags} %install -%makeinstall +%make_install +rm %{buildroot}/%{_defaultdocdir}/%{name}/INSTALL +install -Dm644 %{SOURCE1} %{buildroot}/%{_mandir}/man1/gnucap-modelgen.1 %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files -%defattr(-,root,root,-) -%{_prefix}/bin/* +%defattr(-,root,root,-) +%{_bindir}/* %{_mandir}/man1/* %dir %{_datadir}/%{name} -%dir %{_datadir}/%{name}/doc -%dir %{_datadir}/%{name}/examples %dir %{_datadir}/%{name}/manual -%doc %{_datadir}/%{name}/doc/* -%doc %{_datadir}/%{name}/examples/* %doc %{_datadir}/%{name}/manual/* +%dir %{_defaultdocdir}/%{name} +%dir %{_defaultdocdir}/%{name}/examples +%doc %{_defaultdocdir}/%{name}* %changelog