rpms/basket/devel basket.spec,1.22,1.23

Kevin Kofler (kkofler) fedora-extras-commits at redhat.com
Sat Jun 7 10:58:17 UTC 2008


Author: kkofler

Update of /cvs/pkgs/rpms/basket/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6912/devel

Modified Files:
	basket.spec 
Log Message:
* Sat Jun 07 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 1.0.2-7
- disable -kontact for F10+ (can't integrate KDE 3 app into KDE 4 Kontact)


Index: basket.spec
===================================================================
RCS file: /cvs/pkgs/rpms/basket/devel/basket.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- basket.spec	7 Jun 2008 09:27:03 -0000	1.22
+++ basket.spec	7 Jun 2008 10:57:31 -0000	1.23
@@ -1,3 +1,7 @@
+%if 0%{?fedora} < 10
+%define with_kontact 1
+%endif
+
 Name:           basket
 Summary:        Notes taker
 Version:        1.0.2
@@ -13,7 +17,10 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdelibs3-devel, desktop-file-utils, gamin-devel
-BuildRequires:  gpgme-devel, kdepim-devel
+BuildRequires:  gpgme-devel
+%if 0%{?with_kontact}
+BuildRequires:  kdepim-devel
+%endif
 
 %description
 This application is mainly an all-purpose notes taker. It provides baskets
@@ -21,6 +28,7 @@
 images, sounds, files, colors, application launcher...
 BasKet lets you keep all objects in one place, and keep data at hand.
 
+%if 0%{?with_kontact}
 %package kontact
 Group:          Applications/Productivity
 Summary:        Basket plugin for Kontact
@@ -29,6 +37,7 @@
 
 %description kontact
 This package contains the kontact plugin for BasKet.
+%endif
 
 
 %prep
@@ -108,13 +117,18 @@
 %{_datadir}/config/magic/basket.magic
 %{_datadir}/mimelnk/application/*.desktop
 
+%if 0%{?with_kontact}
 %files kontact
 %{_datadir}/apps/kontact/ksettingsdialog/kontact_basketplugin.setdlg
 %{_datadir}/services/kontact/*.desktop
 %{_libdir}/kde3/libkontact_basket.*
+%endif
 
 
 %changelog
+* Sat Jun 07 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 1.0.2-7
+- disable -kontact for F10+ (can't integrate KDE 3 app into KDE 4 Kontact)
+
 * Sun Jun 01 2008 Aurelien Bompard <abompard at fedoraproject.org> 1.0.2-6
 - rebuild
 




More information about the fedora-extras-commits mailing list