rpms/gspiceui/F-11 gspiceui-xpm.patch, NONE, 1.1 gspiceui.desktop, 1.1, 1.2 gspiceui.spec, 1.3, 1.4 import.log, 1.1, 1.2
Chitlesh GOORAH
chitlesh at fedoraproject.org
Thu Sep 3 06:39:42 UTC 2009
Author: chitlesh
Update of /cvs/pkgs/rpms/gspiceui/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32490/F-11
Modified Files:
gspiceui.desktop gspiceui.spec import.log
Added Files:
gspiceui-xpm.patch
Log Message:
built on wxGTK2.8
gspiceui-xpm.patch:
file-close.xpm | 2 +-
file-import.xpm | 2 +-
file-open.xpm | 2 +-
file-reload.xpm | 2 +-
file-save.xpm | 2 +-
file-saveas.xpm | 2 +-
gspiceui-32x32.xpm | 2 +-
gspiceui-48x48.xpm | 2 +-
help.xpm | 2 +-
html-back.xpm | 2 +-
html-close.xpm | 2 +-
sim-create.xpm | 2 +-
sim-edit.xpm | 2 +-
sim-plot.xpm | 2 +-
sim-run.xpm | 2 +-
sim-stop.xpm | 2 +-
16 files changed, 16 insertions(+), 16 deletions(-)
--- NEW FILE gspiceui-xpm.patch ---
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",
Index: gspiceui.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/gspiceui/F-11/gspiceui.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gspiceui.desktop 28 Jul 2008 07:41:35 -0000 1.1
+++ gspiceui.desktop 3 Sep 2009 06:39:41 -0000 1.2
@@ -1,9 +1,9 @@
[Desktop Entry]
-Name=GspiceUI
-Comment=Spice Electronic circuit similators UI
+Name=Spice Simulation Frontend
+Comment=Simulates spice netlists and gEDA schematics
Exec=gspiceui
Icon=gspiceui
Terminal=false
Type=Application
Encoding=UTF-8
-Categories=Education;Science;Engineering;
+Categories=Electronics;Engineering;
Index: gspiceui.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gspiceui/F-11/gspiceui.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gspiceui.spec 25 Feb 2009 01:25:11 -0000 1.3
+++ gspiceui.spec 3 Sep 2009 06:39:41 -0000 1.4
@@ -1,6 +1,6 @@
Name: gspiceui
Version: 0.9.65
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: A GUI to freely available Spice Electronic circuit similators
Group: Applications/System
@@ -8,9 +8,10 @@ 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: compat-wxGTK26-devel, desktop-file-utils
+BuildRequires: wxGTK-devel, desktop-file-utils
Requires: ngspice, geda-gnetlist, geda-gschem
Requires: gwave, electronics-menu
@@ -28,13 +29,21 @@ 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
-sed -i 's|wx-config|wx-2.6-config|' src/Makefile
+
+#wrong-file-end-of-line-encoding
+sed -i 's/\r//' lib/*/*.mod
+
+#spurious-executable-perm
+chmod 0644 lib/*/*.mod
+
%build
-make %{?_smp_mflags} CC="%{__cxx} $RPM_OPT_FLAGS" GSPICEUI_DBG=0 GSPICEUI_WXLIB=2.6
+make %{?_smp_mflags} CC="%{__cxx} $RPM_OPT_FLAGS" GSPICEUI_DBG=0 GSPICEUI_WXLIB=2.8
%install
rm -rf $RPM_BUILD_ROOT
@@ -60,13 +69,13 @@ install -pm 0644 src/icons/%{name}-32x32
install -pm 0644 src/icons/%{name}-48x48.xpm \
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.xpm
-desktop-file-install --vendor "Fedora" \
+desktop-file-install --vendor "" \
--mode 0644 \
- --remove-category="Science;Education" \
- --add-category Electronics \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
%{SOURCE1}
+find %{buildroot} -name Makefile -exec rm -f {} ';'
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -85,6 +94,7 @@ touch --no-create %{_datadir}/icons/hico
%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README ChangeLog TODO
+%doc sch/ lib/
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_datadir}/icons/hicolor/??x??/apps/*.xpm
@@ -94,6 +104,10 @@ touch --no-create %{_datadir}/icons/hico
%changelog
+* Thu Sep 03 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT com> - 0.9.65-5
+- Fixes RHBZ #512076 - Build with wxGTK-devel not compat-wxGTK26-devel
+- Added documentations: schematics and spice models
+
* 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.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log 28 Jul 2008 07:41:35 -0000 1.1
+++ import.log 3 Sep 2009 06:39:41 -0000 1.2
@@ -1 +1,2 @@
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
More information about the scm-commits
mailing list