rpms/pikdev/FC-5 pikdev-0.8.4.ppcbuild, NONE, 1.1 pikdev.spec, 1.2, 1.3

[Alain Portal (dionysos)]

Author: dionysos

Update of /cvs/extras/rpms/pikdev/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14224

Modified Files:
	pikdev.spec 
Added Files:
	pikdev-0.8.4.ppcbuild 
Log Message:
Add patch to try to build ppc arch


--- NEW FILE pikdev-0.8.4.ppcbuild ---
--- pikdev/uparport.hh.orig	2005-01-07 22:26:24.000000000 +0100
+++ pikdev/uparport.hh	2006-04-07 11:20:27.000000000 +0200
@@ -18,7 +18,6 @@
 // in RedHat & Mandrake distro, ppdev.h is into /usr/include/linux 
 #include <linux/ppdev.h>   
 #include <sys/time.h>
-#include <sys/io.h> 
 #include <fcntl.h>
 }           
 


Index: pikdev.spec
===================================================================
RCS file: /cvs/extras/rpms/pikdev/FC-5/pikdev.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pikdev.spec	15 Mar 2006 10:31:35 -0000	1.2
+++ pikdev.spec	7 Apr 2006 10:53:07 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		pikdev
 Version:	0.8.4
-Release:	4%{?dist}
+Release:	10%{?dist}
 Summary:	IDE for development of PICmicro based application (under Linux/KDE)
 Summary(fr):	EDI pour le développement d'applications à base de microcontrôleurs PIC
 
@@ -11,14 +11,13 @@
 Source1:	%{name}.desktop
 Source2:	README.Fedora
 Source3:	LISEZMOI.Fedora
+Patch:		%{name}-%{version}.ppcbuild
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils, kdelibs-devel
 
 Requires:	gputils
 
-ExcludeArch:	ppc
-
 %description
 PiKdev is a simple IDE dedicated to the development of PIC
 based applications under KDE.
@@ -54,11 +53,16 @@
 
 %setup -q
 
+%patch
+
 %{__cp} -p %{SOURCE2} .
 %{__cp} -p %{SOURCE3} .
 
 %build
 
+unset QTDIR || : ; . /etc/profile.d/qt.sh
+export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
+
 %configure --disable-rpath
 
 rm -rf pkp
@@ -102,6 +106,24 @@
 %{_datadir}/icons/*
 
 %changelog
+* Fri Apr 07 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.4-10
+  - Fix patch name
+* Fri Apr 07 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.4-9
+  - Add patch to try to build ppc arch
+  - Contributions of David Woodhouse <dwmw2[AT]redhat[DOT]com>
+* Wed Apr 05 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.4-8
+  - New try to build x86_64 arch for FC-4
+  - Unset $QTDIR before sourcing qt.sh
+  - Thanks to Rex Dieter <rdieter[AT]math[DOT]unl[DOT]edu>
+    and Michael Schwendt <bugs[DOT]michael[AT]gmx[DOT]net>
+* Thu Mar 23 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.4-7
+  - No fix. So, remove the previous change
+  - Definitely exclude arch x86_64 for FC-4
+* Thu Mar 23 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.4-6
+  - $QTDIR is set. So, remove the previous change
+  - Try to fix x86_64 build failure by adding BR qt-devel
+* Wed Mar 15 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.4-5
+  - Source qt.sh if $QTDIR isn't set. Always Ralf...
 * Wed Mar 15 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.4-4
   - Exclude temporarily ppc arch because <sys/io.h> don't exist
     in ppc glibc headers
@@ -111,13 +133,13 @@
     Thanks to him.
 * Wed Mar 08 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.4-3
   - Remove useless BuildRequires qt-devel, xorg-x11-devel for FE5
-  - Package must own %{_datadir}/apps/%{name} directory
+  - Package must own %%{_datadir}/apps/%%{name} directory
 * Tue Jan 31 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.4-2
   - Don't use the precompiled version of pkp
 * Mon Jan 30 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.4-1
   - New upstream version
 * Tue Jan 10 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.2-2
-  - Add the %{?dist} macro
+  - Add the %%{?dist} macro
 * Fri Dec 16 2005 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.2-1
   - New version
   - Add french summary and description