rpms/basket/EL-5 basket.spec,1.15,1.16

[Manuel Wolfshant]

Author: wolfy

Update of /cvs/pkgs/rpms/basket/EL-5
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv30230

Modified Files:
	basket.spec 
Log Message:
* Tue Jun 22 2010 wolfy at nobugconsulting.ro - 1.0.3.1-8
- replace %exclusivearch{ix86} with %excludearch{ppc}
- fix conditionals (for EPEL-6)



Index: basket.spec
===================================================================
RCS file: /cvs/pkgs/rpms/basket/EL-5/basket.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- basket.spec	21 Jun 2010 13:17:15 -0000	1.15
+++ basket.spec	22 Jun 2010 15:13:04 -0000	1.16
@@ -1,10 +1,13 @@
-%if 0%{?fedora} < 10
+%if 0%{?fedora} && 0%{?fedora} < 10 
+%define with_kontact 1
+%endif
+%if 0%{?rhel} && 0%{?rhel} < 6
 %define with_kontact 1
 %endif
 
 Name:          basket
 Version:       1.0.3.1
-Release:       7%{?dist}
+Release:       8%{?dist}
 Summary:       Taking care of your ideas
 
 Group:         Applications/Productivity
@@ -22,10 +25,11 @@ BuildRequires: kdelibs3-devel
 BuildRequires: kdepim3-devel
 %endif
 BuildRequires: gpgme-devel gettext desktop-file-utils
-%if 0%{?with_kontact}
-%endif 
-#ppc build fails due to missing kdepim
-ExclusiveArch: %{ix86}
+
+#ppc build fails due to kdepim not existing in RHEL / ppc arch
+%if 0%{?rhel} 
+ExcludeArch: ppc ppc64
+%endif
 
 %description
 A multi-purpose note-taking application that makes it easy to write down ideas
@@ -137,6 +141,10 @@ fi
 update-desktop-database &> /dev/null || :
 
 %changelog
+* Tue Jun 22 2010 wolfy at nobugconsulting.ro - 1.0.3.1-8
+- replace %%exclusivearch{ix86} with %%excludearch{ppc}
+- fix conditionals (for EPEL-6)
+
 * Fri Jun 18 2010 wolfy at nobugconsulting.ro - 1.0.3.1-7
 - adjust spec from F-12 so as to build in EPEL-5