rpms/ktechlab/F-10 import.log,1.3,1.4 ktechlab.spec,1.24,1.25

[Chitlesh GOORAH]

Author: chitlesh

Update of /cvs/pkgs/rpms/ktechlab/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16663/F-10

Modified Files:
	import.log ktechlab.spec 
Log Message:
Bug 511578 -  FTBFS ktechlab-0.3.70-1.20090304svn.fc11


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ktechlab/F-10/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	5 Mar 2009 21:29:42 -0000	1.3
+++ import.log	5 Sep 2009 09:21:05 -0000	1.4
@@ -1,3 +1,4 @@
 ktechlab-0_3_69-9_20081031svn_fc9:HEAD:ktechlab-0.3.69-9.20081031svn.fc9.src.rpm:1225612333
 ktechlab-0_3_69-10_20081031svn_fc9:HEAD:ktechlab-0.3.69-10.20081031svn.fc9.src.rpm:1225739868
 ktechlab-0_3_70-1_20090304svn_fc10:F-10:ktechlab-0.3.70-1.20090304svn.fc10.src.rpm:1236288430
+ktechlab-0_3_70-2_20090304svn_fc11:F-10:ktechlab-0.3.70-2.20090304svn.fc11.src.rpm:1252142262


Index: ktechlab.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ktechlab/F-10/ktechlab.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- ktechlab.spec	5 Mar 2009 21:29:42 -0000	1.24
+++ ktechlab.spec	5 Sep 2009 09:21:05 -0000	1.25
@@ -1,6 +1,6 @@
 Name:             ktechlab
 Version:          0.3.70
-Release:          1.20090304svn%{?dist}
+Release:          2.20090304svn%{?dist}
 # revision checkout 238
 
 Summary:          Development and simulation of microcontrollers and electronic circuits
@@ -45,9 +45,17 @@ to KTechlab.
 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
@@ -59,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                           \
@@ -104,13 +112,17 @@ 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
-* Wed Mar 04 2009 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.3.70-1.200900403svn
+* 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