rpms/basket/EL-6 basket.spec,1.28,1.29 import.log,1.1,1.2

[Manuel Wolfshant]

Author: wolfy

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

Modified Files:
	basket.spec import.log 
Log Message:
initial version for EPEL-6, requires KDE3 libs


Index: basket.spec
===================================================================
RCS file: /cvs/pkgs/rpms/basket/EL-6/basket.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- basket.spec	24 Jul 2009 17:52:58 -0000	1.28
+++ basket.spec	22 Jun 2010 15:26:02 -0000	1.29
@@ -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:       6%{?dist}
+Release:       8%{?dist}
 Summary:       Taking care of your ideas
 
 Group:         Applications/Productivity
@@ -14,11 +17,19 @@ Source0:       http://basket.kde.org/dow
 # Make it appear in Kontact from enterprise branch
 Patch0:        basket-1.0.2-kdepimenterprise.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires: kdelibs3-devel gpgme-devel gettext desktop-file-utils
-%if 0%{?with_kontact}
+%if 0%{?rhel} && 0%{?rhel} < 6
+BuildRequires: kdelibs-devel
+BuildRequires: kdepim-devel
+%else
+BuildRequires: kdelibs3-devel
 BuildRequires: kdepim3-devel
-%endif 
+%endif
+BuildRequires: gpgme-devel gettext desktop-file-utils
+
+#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
@@ -31,7 +42,11 @@ encryption.
 Group:          Applications/Productivity
 Summary:        Basket plugin for Kontact
 Requires:       %{name} = %{version}-%{release}
-Requires:       kdepim3
+%if 0%{?rhel} && 0%{?rhel} < 6
+BuildRequires: kdepim
+%else
+BuildRequires: kdepim3
+%endif
 
 %description kontact
 This package contains the kontact plugin for BasKet.
@@ -126,6 +141,13 @@ 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
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.3.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/basket/EL-6/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	13 Nov 2008 05:25:14 -0000	1.1
+++ import.log	22 Jun 2010 15:26:02 -0000	1.2
@@ -1 +1,2 @@
 basket-1_0_3_1-2_fc10:HEAD:basket-1.0.3.1-2.fc10.src.rpm:1226532725
+basket-1_0_3_1-8_el6:EL-6:basket-1.0.3.1-8.el6.src.rpm:1277220334