rpms/gspiceui/F-11 gspiceui-32x32.xpm, NONE, 1.1 gspiceui-opamp-3.sym, NONE, 1.1 .cvsignore, 1.2, 1.3 gspiceui.spec, 1.4, 1.5 import.log, 1.2, 1.3 sources, 1.2, 1.3 gspiceui-xpm.patch, 1.1, NONE

[Chitlesh GOORAH]

Author: chitlesh

Update of /cvs/pkgs/rpms/gspiceui/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15108/F-11

Modified Files:
	.cvsignore gspiceui.spec import.log sources 
Added Files:
	gspiceui-32x32.xpm gspiceui-opamp-3.sym 
Removed Files:
	gspiceui-xpm.patch 
Log Message:
0.9.97


--- NEW FILE gspiceui-32x32.xpm ---
/* 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##########.",
".##############################.",
".##############################.",
"................................"};


--- NEW FILE gspiceui-opamp-3.sym ---
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?


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gspiceui/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	28 Jul 2008 07:41:35 -0000	1.2
+++ .cvsignore	15 Sep 2009 08:26:22 -0000	1.3
@@ -1 +1 @@
-gspiceui-v0.9.65.tar.gz
+gspiceui-v0.9.97.tar.gz


Index: gspiceui.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gspiceui/F-11/gspiceui.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gspiceui.spec	3 Sep 2009 06:39:41 -0000	1.4
+++ gspiceui.spec	15 Sep 2009 08:26:23 -0000	1.5
@@ -1,21 +1,23 @@
-Name:		gspiceui
-Version:	0.9.65 
-Release:	5%{?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)
-
-BuildRequires:	wxGTK-devel, desktop-file-utils  
-Requires:	ngspice, geda-gnetlist, geda-gschem 
-Requires:	gwave, electronics-menu
+Name:          gspiceui
+Version:       0.9.97
+Release:       1%{?dist}
+Summary:       A GUI to freely available Spice Electronic circuit similators
+
+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
+
+BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires: wxGTK-devel desktop-file-utils
+Requires:      ngspice geda-gnetlist geda-gschem geda-symbols
+Requires:      gwave electronics-menu
 
-ExcludeArch:	ppc64
+ExcludeArch:   ppc64
 
 %description
 GspiceUI is listed among the Fedora Electronic Lab (FEL) packages.
@@ -29,85 +31,85 @@ gSchem is used as the schematic generati
 %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
-* Thu Sep 03 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT com> - 0.9.65-5
+* 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
 
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.65-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.65-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gspiceui/F-11/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	3 Sep 2009 06:39:41 -0000	1.2
+++ import.log	15 Sep 2009 08:26:23 -0000	1.3
@@ -1,2 +1,3 @@
 gspiceui-0_9_65-2_fc9:HEAD:gspiceui-0.9.65-2.fc9.src.rpm:1217230865
 gspiceui-0_9_65-5_fc11:F-11:gspiceui-0.9.65-5.fc11.src.rpm:1251959808
+gspiceui-0_9_97-1_fc11:F-11:gspiceui-0.9.97-1.fc11.src.rpm:1253002991


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gspiceui/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	28 Jul 2008 07:41:35 -0000	1.2
+++ sources	15 Sep 2009 08:26:23 -0000	1.3
@@ -1 +1 @@
-7243c51a7ad1d4138bc28db9695d18c2  gspiceui-v0.9.65.tar.gz
+b72bfcee7e1c57719bebbedf75530ebc  gspiceui-v0.9.97.tar.gz


--- gspiceui-xpm.patch DELETED ---