rpms/ktechlab/EL-5 ktechlab-detect_gpsim.patch, NONE, 1.1 import.log, 1.1, 1.2 ktechlab.spec, 1.2, 1.3 sources, 1.1, 1.2
Chitlesh GOORAH
chitlesh at fedoraproject.org
Sat Sep 5 09:19:22 UTC 2009
Author: chitlesh
Update of /cvs/pkgs/rpms/ktechlab/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16211/EL-5
Modified Files:
import.log ktechlab.spec sources
Added Files:
ktechlab-detect_gpsim.patch
Log Message:
Bug 511578 - FTBFS ktechlab-0.3.70-1.20090304svn.fc11
ktechlab-detect_gpsim.patch:
configure.in.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE ktechlab-detect_gpsim.patch ---
Index: configure.in.in
===================================================================
--- configure.in.in (revision 239)
+++ configure.in.in (working copy)
@@ -30,7 +30,7 @@
#include <gpsim/gpsim_interface.h>
#include <gpsim/breakpoints.h>
#include <gpsim/gpsim_time.h>
-void func() { (void)cycles; (void)initialize_gpsim_core(); (void)load_symbol_file(0,0); }
+void func() { (void)cycles; (void)initialize_gpsim_core(); (void)load_symbol_file(0,0); exit_gpsim(0); }
],
[],
AC_MSG_RESULT( yes )
@@ -47,7 +47,7 @@
#include <gpsim/gpsim_time.h>
#include <gpsim/symbol.h>
#include <gpsim/program_files.h>
-void func() { (void)cycles; (void)initialize_gpsim_core(); }
+void func() { (void)cycles; (void)initialize_gpsim_core(); exit_gpsim(0); }
],
[],
AC_MSG_RESULT( yes )
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ktechlab/EL-5/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log 8 Nov 2008 00:02:32 -0000 1.1
+++ import.log 5 Sep 2009 09:19:21 -0000 1.2
@@ -1 +1,2 @@
ktechlab-0_3_69-10_20081031svn_fc10:EL-5:ktechlab-0.3.69-10.20081031svn.fc10.src.rpm:1226102477
+ktechlab-0_3_70-2_20090304svn_fc11:EL-5:ktechlab-0.3.70-2.20090304svn.fc11.src.rpm:1252142150
Index: ktechlab.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ktechlab/EL-5/ktechlab.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ktechlab.spec 11 Nov 2008 21:09:21 -0000 1.2
+++ ktechlab.spec 5 Sep 2009 09:19:21 -0000 1.3
@@ -1,7 +1,7 @@
Name: ktechlab
-Version: 0.3.69
-Release: 11.20081031svn%{?dist}
-# revision checkout 150
+Version: 0.3.70
+Release: 2.20090304svn%{?dist}
+# revision checkout 238
Summary: Development and simulation of microcontrollers and electronic circuits
@@ -9,21 +9,16 @@ License: GPLv2
Group: Applications/Engineering
URL: http://sourceforge.net/projects/ktechlab/
-Source: %{name}-svn20081031.tar.bz2
+Source: %{name}-0.3.7.tar.gz
Patch0: ktechlab-0.3.6-multilib.patch
+Patch1: ktechlab-detect_gpsim.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: gpsim-devel readline-devel
+BuildRequires: gpsim-devel readline-devel kdelibs3-devel
BuildRequires: desktop-file-utils autoconf automake
-%if 0%{?fedora} > 8
-BuildRequires: kdelibs3-devel
-%else
-BuildRequires: kdelibs-devel
-%endif
-
# Ktechlab requires gputils for PIC simulation.
Requires: gputils electronics-menu sdcc
@@ -44,13 +39,23 @@ to KTechlab.
* Integrated assembler and disassembler via gpasm and gpdasm.
%prep
-%setup -q -n %{name}-svn20081031
+%setup -q -n %{name}-0.3.7
+
chmod +x ./admin/detect-autoconf.pl
%{__rm} -rf autom4te.cache
+# Fix for Bug 511578 - FTBFS ktechlab-0.3.70-1.20090304svn.fc11
+%{__sed} -i "s|automake\*1.10\*|automake\*1.11\*|" admin/cvs.sh
+
%patch0 -p0 -b .multilib
+# Upstream already applied this patch
+%patch1 -p0 -b .gpsim
+
+# /usr/bin/install: will not overwrite just-created
+%{__sed} -i "s|while.png for.png||" icons/pics/Makefile.am
+
%build
%{__make} -f Makefile.cvs
@@ -62,7 +67,7 @@ chmod +x ./admin/detect-autoconf.pl
%{__rm} -rf %{buildroot}
%{__make} DESTDIR=%{buildroot} install
-desktop-file-install --vendor fedora \
+desktop-file-install --vendor "" \
--remove-category Education \
--remove-category Science \
--delete-original \
@@ -81,10 +86,6 @@ chmod 0755 %{buildroot}%{_sysconfdir}/pr
# Fix absolute symlink
%{__rm} -f %{buildroot}%{_docdir}/HTML/en/%{name}/common
-#fixing missing icon
-%{__cp} -p icons/pics/bar_graph_display.png %{buildroot}%{_datadir}/apps/%{name}/icons/
-
-
%find_lang %{name}
%clean
@@ -111,14 +112,22 @@ touch --no-create %{_datadir}/icons/hico
%{_datadir}/apps/katepart/syntax/microbe.xml
%{_datadir}/config.kcfg/%{name}.kcfg
%{_datadir}/mimelnk/application/*.desktop
-%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/*/*/*.png
%{_sysconfdir}/profile.d/%{name}.sh
%Changelog
-* Tue Nov 11 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.3.69-11.20081031svn
-- fixed BR kdelibX-devel for epel
+* Sat Sep 05 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.3.70-2.200900304svn
+- Fixed Bug 511578 - FTBFS ktechlab-0.3.70-1.20090304svn.fc11
+- Rebuilt to improve stability : gpsim-0.23
+
+* Wed Mar 04 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.3.70-1.200900304svn
+- new svn checkout 238
+- included patch from upstream, Julian Bäume, to build on gpsim 0.23
+
+* Sat Jan 31 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.3.69-11.20090131svn
+- new svn checkout 175
* Mon Nov 03 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.3.69-10.20081031svn
- added sdcc as Requires
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ktechlab/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources 8 Nov 2008 00:02:32 -0000 1.1
+++ sources 5 Sep 2009 09:19:21 -0000 1.2
@@ -1 +1 @@
-79f08b90fc086520094f9086ae3aed1f ktechlab-svn20081031.tar.bz2
+328bb07a777241a1ccb54162eea5de6f ktechlab-0.3.7.tar.gz
More information about the fedora-extras-commits
mailing list