rpms/pikdev/FC-4 pikdev.spec,1.3,1.4

Alain Portal (dionysos) fedora-extras-commits at redhat.com
Thu Mar 23 09:41:23 UTC 2006


Author: dionysos

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

Modified Files:
	pikdev.spec 
Log Message:
Try to fix x86_64 build failure by adding BR qt-devel


Index: pikdev.spec
===================================================================
RCS file: /cvs/extras/rpms/pikdev/FC-4/pikdev.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pikdev.spec	15 Mar 2006 15:16:41 -0000	1.3
+++ pikdev.spec	23 Mar 2006 09:41:22 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		pikdev
 Version:	0.8.4
-Release:	5%{?dist}
+Release:	6%{?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
 
@@ -13,7 +13,7 @@
 Source3:	LISEZMOI.Fedora
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	desktop-file-utils, kdelibs-devel
+BuildRequires:	desktop-file-utils, kdelibs-devel, qt-devel
 
 Requires:	gputils
 
@@ -59,8 +59,6 @@
 
 %build
 
-[ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
-
 %configure --disable-rpath
 
 rm -rf pkp
@@ -104,6 +102,9 @@
 %{_datadir}/icons/*
 
 %changelog
+* 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
@@ -115,13 +116,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




More information about the fedora-extras-commits mailing list