From 83179de4ceacac6310b2b98f58e53c6fefce6ad1 Mon Sep 17 00:00:00 2001
From: Chitlesh GOORAH <chitlesh@fedoraproject.org>
Date: Sep 15 2009 08:28:35 +0000
Subject: 0.9.97


---

diff --git a/.cvsignore b/.cvsignore
index cf50c42..8374632 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gspiceui-v0.9.65.tar.gz
+gspiceui-v0.9.97.tar.gz
diff --git a/gspiceui-32x32.xpm b/gspiceui-32x32.xpm
new file mode 100644
index 0000000..2e255c2
--- /dev/null
+++ b/gspiceui-32x32.xpm
@@ -0,0 +1,41 @@
+/* XPM */
+static char *gspiceui_xpm[]={
+"32 32 6 1",
+"b c #000000",
+"e c #0000ff",
+"f c #58a8ff",
+"d c #c00000",
+". c #c000c0",
+"# c #c0ffc0",
+"................................",
+".##############################.",
+".##############################.",
+".######bbbbbbbbb###############.",
+".######b#######b###############.",
+".##bbbbb#######bbbbbbbbbbbbbb##.",
+".######b#######b#####b#########.",
+".######bbbbbbbbb#####b#########.",
+".####################b#########.",
+".#################bbbbbbb######.",
+".#####d########################.",
+".#####d########################.",
+".#####d###########bbbbbbb######.",
+".#####d##############b#########.",
+".#####d##ee##########b#########.",
+".#####d#effe#######bbbbb#######.",
+".#####dee##ee##################.",
+".#####de####ef######bbb########.",
+".#####ef####fe#################.",
+".####fe######ef######b#########.",
+".####ed######fe##########ee####.",
+".###fed#######ef########effe###.",
+".###efd#######fe#######ef##fe##.",
+".##feddddddddddefdddddfeddddd##.",
+".##e##d########fe#####ef#######.",
+".#####d#########ef###fe########.",
+".#####d#########fe###ef########.",
+".#####d##########fefef#########.",
+".#####d###########eee##########.",
+".##############################.",
+".##############################.",
+"................................"};
diff --git a/gspiceui-opamp-3.sym b/gspiceui-opamp-3.sym
new file mode 100644
index 0000000..343e2d2
--- /dev/null
+++ b/gspiceui-opamp-3.sym
@@ -0,0 +1,50 @@
+v 20040111 1
+L 200 1200 200 0 3 0 0 0 -1 -1
+L 200 0 1200 600 3 0 0 0 -1 -1
+L 1200 600 200 1200 3 0 0 0 -1 -1
+P 200 900 0 900 1 0 1
+{
+T 150 925 5 8 1 1 0 6 1
+pinnumber=1
+T 150 925 5 8 0 0 0 6 1
+pinseq=1
+}
+P 200 300 0 300 1 0 1
+{
+T 150 325 5 8 1 1 0 6 1
+pinnumber=2
+T 150 325 5 8 0 0 0 6 1
+pinseq=2
+}
+P 1200 600 1400 600 1 0 1
+{
+T 1275 625 5 8 1 1 0 0 1
+pinnumber=5
+T 1275 625 5 8 0 0 0 0 1
+pinseq=5
+}
+P 700 900 700 1100 1 0 1
+{
+T 750 950 5 8 1 1 0 0 1
+pinnumber=3
+T 725 950 5 8 0 0 0 0 1
+pinseq=3
+}
+P 700 300 700 100 1 0 1
+{
+T 600 125 5 8 0 0 0 0 1
+pinseq=4
+T 750 150 5 10 1 1 0 0 1
+pinnumber=4
+}
+L 300 950 300 850 3 0 0 0 -1 -1
+L 250 900 350 900 3 0 0 0 -1 -1
+L 250 300 350 300 3 0 0 0 -1 -1
+T 350 550 9 8 1 0 0 0 1
+OP AMP
+T 675 400 9 6 1 0 0 4 1
+Vee
+T 675 825 9 6 1 0 0 4 1
+Vcc
+T 1000 925 8 10 1 1 0 0 1
+refdes=U?
diff --git a/gspiceui-xpm.patch b/gspiceui-xpm.patch
deleted file mode 100644
index 442bf7d..0000000
--- a/gspiceui-xpm.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-diff -Naur gspiceui-v0.9.65/src/icons/file-close.xpm gspiceui-v0.9.65_mod/src/icons/file-close.xpm
---- gspiceui-v0.9.65/src/icons/file-close.xpm	2007-09-10 01:37:26.000000000 +0200
-+++ gspiceui-v0.9.65_mod/src/icons/file-close.xpm	2009-09-03 07:48:44.621541915 +0200
-@@ -1,5 +1,5 @@
- /* XPM */
--static char * file_close_xpm[] = {
-+static const char * file_close_xpm[] = {
- "22 22 78 1",
- " 	c None",
- ".	c #464646",
-diff -Naur gspiceui-v0.9.65/src/icons/file-import.xpm gspiceui-v0.9.65_mod/src/icons/file-import.xpm
---- gspiceui-v0.9.65/src/icons/file-import.xpm	2007-09-10 01:37:26.000000000 +0200
-+++ gspiceui-v0.9.65_mod/src/icons/file-import.xpm	2009-09-03 07:48:48.935542898 +0200
-@@ -1,5 +1,5 @@
- /* XPM */
--static char * file_import_xpm[] = {
-+static const char * file_import_xpm[] = {
- "24 24 221 2",
- "  	c None",
- ". 	c #000000",
-diff -Naur gspiceui-v0.9.65/src/icons/file-open.xpm gspiceui-v0.9.65_mod/src/icons/file-open.xpm
---- gspiceui-v0.9.65/src/icons/file-open.xpm	2007-09-10 01:37:26.000000000 +0200
-+++ gspiceui-v0.9.65_mod/src/icons/file-open.xpm	2009-09-03 07:48:53.678542646 +0200
-@@ -1,5 +1,5 @@
- /* XPM */
--static char * file_open_xpm[] = {
-+static const char * file_open_xpm[] = {
- "24 24 205 2",
- "  	c None",
- ". 	c #000000",
-diff -Naur gspiceui-v0.9.65/src/icons/file-reload.xpm gspiceui-v0.9.65_mod/src/icons/file-reload.xpm
---- gspiceui-v0.9.65/src/icons/file-reload.xpm	2007-09-10 01:37:26.000000000 +0200
-+++ gspiceui-v0.9.65_mod/src/icons/file-reload.xpm	2009-09-03 07:48:57.449542899 +0200
-@@ -1,5 +1,5 @@
- /* XPM */
--static char * file_reload_xpm[] = {
-+static const char * file_reload_xpm[] = {
- "22 22 47 1",
- " 	c None",
- ".	c #346C30",
-diff -Naur gspiceui-v0.9.65/src/icons/file-saveas.xpm gspiceui-v0.9.65_mod/src/icons/file-saveas.xpm
---- gspiceui-v0.9.65/src/icons/file-saveas.xpm	2007-09-10 01:37:26.000000000 +0200
-+++ gspiceui-v0.9.65_mod/src/icons/file-saveas.xpm	2009-09-03 07:49:01.095541779 +0200
-@@ -1,5 +1,5 @@
- /* XPM */
--static char * file_saveas_xpm[] = {
-+static const char * file_saveas_xpm[] = {
- "22 22 139 2",
- "  	c None",
- ". 	c #FDD7A6",
-diff -Naur gspiceui-v0.9.65/src/icons/file-save.xpm gspiceui-v0.9.65_mod/src/icons/file-save.xpm
---- gspiceui-v0.9.65/src/icons/file-save.xpm	2007-09-10 01:37:26.000000000 +0200
-+++ gspiceui-v0.9.65_mod/src/icons/file-save.xpm	2009-09-03 07:49:04.513541785 +0200
-@@ -1,5 +1,5 @@
- /* XPM */
--static char * filesave_xpm[] = {
-+static const char * filesave_xpm[] = {
- "22 22 118 2",
- "  	c None",
- ". 	c #6B6B6B",
-diff -Naur gspiceui-v0.9.65/src/icons/gspiceui-32x32.xpm gspiceui-v0.9.65_mod/src/icons/gspiceui-32x32.xpm
---- gspiceui-v0.9.65/src/icons/gspiceui-32x32.xpm	2007-09-10 01:37:26.000000000 +0200
-+++ gspiceui-v0.9.65_mod/src/icons/gspiceui-32x32.xpm	2009-09-03 07:48:19.260543296 +0200
-@@ -1,5 +1,5 @@
- /* XPM */
--static char *gspiceui_xpm[]={
-+static const char *gspiceui_xpm[]={
- "32 32 6 1",
- "b c #000000",
- "e c #0000ff",
-diff -Naur gspiceui-v0.9.65/src/icons/gspiceui-48x48.xpm gspiceui-v0.9.65_mod/src/icons/gspiceui-48x48.xpm
---- gspiceui-v0.9.65/src/icons/gspiceui-48x48.xpm	2007-09-10 01:37:26.000000000 +0200
-+++ gspiceui-v0.9.65_mod/src/icons/gspiceui-48x48.xpm	2009-09-03 07:49:13.279541320 +0200
-@@ -1,5 +1,5 @@
- /* XPM */
--static char *gspiceui[]={
-+static const char *gspiceui[]={
- "48 48 7 1",
- "d c #0058c0",
- "a c #303030",
-diff -Naur gspiceui-v0.9.65/src/icons/help.xpm gspiceui-v0.9.65_mod/src/icons/help.xpm
---- gspiceui-v0.9.65/src/icons/help.xpm	2007-09-10 01:37:26.000000000 +0200
-+++ gspiceui-v0.9.65_mod/src/icons/help.xpm	2009-09-03 07:49:08.588542920 +0200
-@@ -1,5 +1,5 @@
- /* XPM */
--static char * help_xpm[] = {
-+static const char * help_xpm[] = {
- "32 32 8 1",
- " 	c None",
- ".	c #800080",
-diff -Naur gspiceui-v0.9.65/src/icons/html-back.xpm gspiceui-v0.9.65_mod/src/icons/html-back.xpm
---- gspiceui-v0.9.65/src/icons/html-back.xpm	2007-09-10 01:37:26.000000000 +0200
-+++ gspiceui-v0.9.65_mod/src/icons/html-back.xpm	2009-09-03 07:46:14.408542719 +0200
-@@ -1,5 +1,5 @@
- /* XPM */
--static char * html_back_xpm[] = {
-+static const char * html_back_xpm[] = {
- /* columns rows colors chars-per-pixel */
- "18 17 3 1",
- "  c black",
-diff -Naur gspiceui-v0.9.65/src/icons/html-close.xpm gspiceui-v0.9.65_mod/src/icons/html-close.xpm
---- gspiceui-v0.9.65/src/icons/html-close.xpm	2007-09-10 01:37:26.000000000 +0200
-+++ gspiceui-v0.9.65_mod/src/icons/html-close.xpm	2009-09-03 07:46:45.017542729 +0200
-@@ -1,5 +1,5 @@
- /* XPM */
--static char * html_close_xpm[] = {
-+static const char * html_close_xpm[] = {
- "22 22 78 1",
- " 	c None",
- ".	c #464646",
-diff -Naur gspiceui-v0.9.65/src/icons/sim-create.xpm gspiceui-v0.9.65_mod/src/icons/sim-create.xpm
---- gspiceui-v0.9.65/src/icons/sim-create.xpm	2007-09-10 01:37:26.000000000 +0200
-+++ gspiceui-v0.9.65_mod/src/icons/sim-create.xpm	2009-09-03 07:49:18.082539173 +0200
-@@ -1,5 +1,5 @@
- /* XPM */
--static char * sim_create_xpm[] = {
-+static const char * sim_create_xpm[] = {
- "22 22 232 2",
- "  	c None",
- ". 	c #8F7F6E",
-diff -Naur gspiceui-v0.9.65/src/icons/sim-edit.xpm gspiceui-v0.9.65_mod/src/icons/sim-edit.xpm
---- gspiceui-v0.9.65/src/icons/sim-edit.xpm	2008-02-18 23:52:47.000000000 +0100
-+++ gspiceui-v0.9.65_mod/src/icons/sim-edit.xpm	2009-09-03 07:49:22.045542990 +0200
-@@ -1,5 +1,5 @@
- /* XPM */
--static char * sim_edit_xpm[] = {
-+static const char * sim_edit_xpm[] = {
- "24 24 5 1",
- " 	c None",
- ".	c #00008B8B0000",
-diff -Naur gspiceui-v0.9.65/src/icons/sim-plot.xpm gspiceui-v0.9.65_mod/src/icons/sim-plot.xpm
---- gspiceui-v0.9.65/src/icons/sim-plot.xpm	2007-09-10 01:37:26.000000000 +0200
-+++ gspiceui-v0.9.65_mod/src/icons/sim-plot.xpm	2009-09-03 07:49:27.417541616 +0200
-@@ -1,5 +1,5 @@
- /* XPM */
--static char * sim_plot_xpm[] = {
-+static const char * sim_plot_xpm[] = {
- "22 22 79 1",
- " 	c None",
- ".	c #000000",
-diff -Naur gspiceui-v0.9.65/src/icons/sim-run.xpm gspiceui-v0.9.65_mod/src/icons/sim-run.xpm
---- gspiceui-v0.9.65/src/icons/sim-run.xpm	2007-09-10 01:37:26.000000000 +0200
-+++ gspiceui-v0.9.65_mod/src/icons/sim-run.xpm	2009-09-03 07:49:31.265541272 +0200
-@@ -1,5 +1,5 @@
- /* XPM */
--static char * sim_run_xpm[] = {
-+static const char * sim_run_xpm[] = {
- "22 22 204 2",
- "  	c None",
- ". 	c #0C0C0A",
-diff -Naur gspiceui-v0.9.65/src/icons/sim-stop.xpm gspiceui-v0.9.65_mod/src/icons/sim-stop.xpm
---- gspiceui-v0.9.65/src/icons/sim-stop.xpm	2007-09-10 01:37:26.000000000 +0200
-+++ gspiceui-v0.9.65_mod/src/icons/sim-stop.xpm	2009-09-03 07:49:35.523541385 +0200
-@@ -1,5 +1,5 @@
- /* XPM */
--static char * sim_stop_xpm[] = {
-+static const char * sim_stop_xpm[] = {
- "24 24 70 1",
- " 	c None",
- ".	c #630000",
diff --git a/gspiceui.spec b/gspiceui.spec
index 213ee08..2ba0d55 100644
--- a/gspiceui.spec
+++ b/gspiceui.spec
@@ -1,21 +1,23 @@
-Name:		gspiceui
-Version:	0.9.65 
-Release:	6%{?dist}
-Summary:	A GUI to freely available Spice Electronic circuit similators
+Name:          gspiceui
+Version:       0.9.97
+Release:       1%{?dist}
+Summary:       A GUI to freely available Spice Electronic circuit similators
 
-Group:		Applications/System 
-License:	GPLv2+
-URL:		http://sourceforge.net/projects/gspiceui
-Source0:	http://downloads.sourceforge.net/%{name}/%{name}-v%{version}.tar.gz
-Source1:	%{name}.desktop
-Patch0:     gspiceui-xpm.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Group:         Applications/Engineering
+License:       GPLv2+
+URL:           http://sourceforge.net/projects/gspiceui
+Source0:       http://downloads.sourceforge.net/%{name}/%{name}-v%{version}.tar.gz
+Source1:       %{name}.desktop
+Source2:       %{name}-opamp-3.sym
+Source3:       %{name}-32x32.xpm
 
-BuildRequires:	wxGTK-devel, desktop-file-utils  
-Requires:	ngspice, geda-gnetlist, geda-gschem 
-Requires:	gwave, electronics-menu
+BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-ExcludeArch:	ppc64
+BuildRequires: wxGTK-devel desktop-file-utils
+Requires:      ngspice geda-gnetlist geda-gschem geda-symbols
+Requires:      gwave electronics-menu
+
+ExcludeArch:   ppc64
 
 %description
 GspiceUI is listed among the Fedora Electronic Lab (FEL) packages.
@@ -29,81 +31,78 @@ gSchem is used as the schematic generation/viewing tool.
 %prep
 %setup -q -n %{name}-v%{version}
 
-%patch0 -p1 -b .xpm
-
-sed -i 's|/usr/local|/usr|g' html/Makefile
-sed -i 's|cp|install -pm 644|g' Makefile html/Makefile
-sed -i 's|cp |install -m 755 |g' src/Makefile
-
 #wrong-file-end-of-line-encoding
 sed -i 's/\r//' lib/*/*.mod
 
 #spurious-executable-perm
 chmod 0644 lib/*/*.mod
+chmod 0644 sch/*/*.sch
+
+sed -i "s|/share/gspiceui/html/gSpiceUI.html|/share/doc/%{name}-%{version}/gSpiceUI.html|g" src/main/HelpTasks.cpp
 
 
 %build
-make %{?_smp_mflags} CC="%{__cxx} $RPM_OPT_FLAGS" GSPICEUI_DBG=0 GSPICEUI_WXLIB=2.8
+%{__make} %{?_smp_mflags} CC="%{__cxx} $RPM_OPT_FLAGS" GSPICEUI_DBG=0 GSPICEUI_WXLIB=2.8
 
-%install
-rm -rf $RPM_BUILD_ROOT
 
-#fix installdir path
-sed -i 's|/usr/local|%{buildroot}%{_prefix}|g' Makefile
+%install
+rm -rf %{buildroot}
 
-#Add missing folder
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
+install -d %{buildroot}%{_bindir}
+install -pm 755 bin/%{name} %{buildroot}%{_bindir}/%{name}
 
-make install DESTDIR=$RPM_BUILD_ROOT
+install -d %{buildroot}%{_mandir}/man1/
+install -pm 644 %{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1
 
-#remove default installed docs|files 
-rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/{README,INSTALL,ChangeLog}
-rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/icons
+#Upstream Sources is missing opamp-3.sym
+install -d %{buildroot}%{_datadir}/gEDA/sym/misc
+install -pm 0644 %{SOURCE2} %{buildroot}%{_datadir}/gEDA/sym/misc/opamp-3.sym
 
 #Add/Manage desktop file
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
-
-install -pm 0644 src/icons/%{name}-32x32.xpm \
-	$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.xpm
+install -d %{buildroot}%{_datadir}/icons/hicolor/32x32/apps
+install -d %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
+install -pm 0644 %{SOURCE3} \
+    %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.xpm
 install -pm 0644 src/icons/%{name}-48x48.xpm \
-	$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.xpm
+    %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/%{name}.xpm
 
-desktop-file-install 	--vendor ""				\
-			--mode 0644					\
-			--dir $RPM_BUILD_ROOT%{_datadir}/applications	\
-			%{SOURCE1}
+desktop-file-install --vendor "" \
+    --dir %{buildroot}%{_datadir}/applications \
+    %{SOURCE1}
 
-find %{buildroot} -name Makefile -exec rm -f {} ';'
+rm -f sch/Makefile lib/Makefile
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
-%post   
+%post
 touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :   
+touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README ChangeLog TODO
-%doc sch/ lib/
+%doc Authors License ReadMe ChangeLog ToDo
+%doc sch/ lib/ html/gSpiceUI.html
 %{_bindir}/%{name}
-%{_datadir}/%{name}
 %{_datadir}/icons/hicolor/??x??/apps/*.xpm
-%{_datadir}/applications/*.desktop
-%{_mandir}/man1/gspiceui.1.gz
-
+%{_datadir}/applications/%{name}.desktop
+%{_mandir}/man1/%{name}.1.gz
+%{_datadir}/gEDA/sym/misc/opamp-3.sym
 
 
 %changelog
+* Mon Sep 14 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT com> - 0.9.97-1
+- New upstream release
+- Added missing opamp-3.sym and corrected menu icon
+
 * Thu Sep 03 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT com> - 0.9.65-6
 - Fixes RHBZ #512076 - Build with wxGTK-devel not compat-wxGTK26-devel
 - Added documentations: schematics and spice models
diff --git a/import.log b/import.log
index 5b65b45..9ab794e 100644
--- a/import.log
+++ b/import.log
@@ -1,3 +1,4 @@
 gspiceui-0_9_65-2_fc9:HEAD:gspiceui-0.9.65-2.fc9.src.rpm:1217230865
 gspiceui-0_9_65-5_fc11:HEAD:gspiceui-0.9.65-5.fc11.src.rpm:1251959887
 gspiceui-0_9_65-6_fc11:HEAD:gspiceui-0.9.65-6.fc11.src.rpm:1251960020
+gspiceui-0_9_97-1_fc11:HEAD:gspiceui-0.9.97-1.fc11.src.rpm:1253003117
diff --git a/sources b/sources
index e0f0466..b97ab15 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7243c51a7ad1d4138bc28db9695d18c2  gspiceui-v0.9.65.tar.gz
+b72bfcee7e1c57719bebbedf75530ebc  gspiceui-v0.9.97.tar.gz