[pykde4] drop pykde4_akonadi macro usage

[Rex Dieter]

commit b17a8e9d9ee1f7c0866d6f2116e02c61e950c992
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Feb 17 14:15:09 2014 -0600

    drop pykde4_akonadi macro usage

 pykde4.spec |   72 ++++++++++++++++++++++++++++++++++------------------------
 1 files changed, 42 insertions(+), 30 deletions(-)
---
diff --git a/pykde4.spec b/pykde4.spec
index 3d991a2..db2bbdf 100644
--- a/pykde4.spec
+++ b/pykde4.spec
@@ -1,4 +1,3 @@
-%define pykde4_akonadi 1
 %define pyqt4_version_min 4.9.5
 %define sip_version_min 4.14
 %if 0%{?fedora} > 17
@@ -11,7 +10,7 @@
 
 Name:    pykde4 
 Version: 4.12.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Python bindings for KDE4 
 
 # http://techbase.kde.org/Policies/Licensing_Policy
@@ -80,14 +79,6 @@ Requires: PyQt4-webkit
 %endif
 %{?_sip_api:Requires: sip-api(%{_sip_api_major}) >= %{_sip_api}}
 Provides: python-kde4 = %{version}-%{release}
-%if ! 0%{?pykde4_akonadi}
-Provides: PyKDE4-akonadi = %{version}-%{release}
-Provides: PyKDE4-akonadi%{?_isa} = %{version}-%{release}
-Provides: pykde4-akonadi% = %{version}-%{release}
-Provides: pykde4-akonadi%{?_isa} = %{version}-%{release}
-Requires: kdepimlibs-akonadi%{?_isa} >= %{version}
-%endif
-
 Obsoletes: PyKDE4 < 4.7.97-1
 Provides:  PyKDE4 = %{version}-%{release}
 Provides:  PyKDE4%{?_isa} = %{version}-%{release}
@@ -112,9 +103,7 @@ Provides: python-kde4-devel = %{version}-%{release}
 Obsoletes: PyKDE4-devel < 4.7.97-1
 Provides:  PyKDE4-devel =  %{version}-%{release}
 Provides:  PyKDE4-devel%{?_isa} = %{version}-%{release}
-%if 0%{?pykde4_akonadi}
 Requires: %{name}-akonadi%{?_isa} = %{version}-%{release}
-%endif
 Requires: PyQt4-devel
 Requires: %{name}%{?_isa} = %{version}-%{release}
 %description devel
@@ -123,13 +112,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 %package -n python3-pykde4
 Summary: Python 3 bindings for KDE 
 Provides: python3-kde4 = %{version}-%{release}
-%if ! 0%{?pykde4_akonadi}
-Provides: python3-pykde4-akonadi = %{version}-%{release}
-Provides: python3-pykde4-akonadi%{?_isa} = %{version}-%{release}
-Provides: python3-PyKDE4-akonadi = %{version}-%{release}
-Provides: python3-PyKDE4-akonadi%{?_isa} = %{version}-%{release}
-Requires: kdepimlibs-akonadi%{?_isa} >= %{version}
-%endif
 Obsoletes: python3-PyKDE4 < 4.7.97-1
 Provides:  python3-PyKDE4 =  %{version}-%{release}
 Provides:  python3-PyKDE4%{?_isa} = %{version}-%{release}
@@ -153,9 +135,7 @@ Requires: kdepimlibs-akonadi%{?_isa} >= %{version}
 Summary:  Files needed to build %{name}-based applications
 Requires: python3-PyQt4-devel
 Requires: python3-pykde4%{?_isa} = %{version}-%{release}
-%if 0%{?pykde4_akonadi}
 Requires: python3-pykde4-akonadi%{?_isa} = %{version}-%{release}
-%endif
 Obsoletes: python3-PyKDE4-devel < 4.7.97-1
 Provides:  python3-PyKDE4-devel =  %{version}-%{release}
 Provides:  python3-PyKDE4-devel%{?_isa} = %{version}-%{release}
@@ -244,16 +224,30 @@ mv %{buildroot}%{_kde4_appsdir}/pykde4/examples/ %{buildroot}%{_docdir}/pykde4/
 
 
 %files 
-%{python_sitearch}/PyKDE4/
+%dir %{python_sitearch}/PyKDE4/
+%{python_sitearch}/PyKDE4/__init__.py*
+%{python_sitearch}/PyKDE4/dnssd.so
+%{python_sitearch}/PyKDE4/kdecore.so
+%{python_sitearch}/PyKDE4/kdeui.so
+%{python_sitearch}/PyKDE4/khtml.so
+%{python_sitearch}/PyKDE4/kio.so
+%{python_sitearch}/PyKDE4/knewstuff.so
+%{python_sitearch}/PyKDE4/kparts.so
+%{python_sitearch}/PyKDE4/kterminal.so
+%{python_sitearch}/PyKDE4/ktexteditor.so
+%{python_sitearch}/PyKDE4/kutils.so
+%{python_sitearch}/PyKDE4/nepomuk.so
+%{python_sitearch}/PyKDE4/phonon.so
+%{python_sitearch}/PyKDE4/plasma.so
+%{python_sitearch}/PyKDE4/pykdeconfig.py*
+%{python_sitearch}/PyKDE4/solid.so
+%{python_sitearch}/PyKDE4/soprano.so
 %{python_sitearch}/PyQt4/uic/widget-plugins/*
 %dir %{_docdir}/pykde4
 %{_kde4_libdir}/kde4/kpythonpluginfactory.so
 
-%if 0%{?pykde4_akonadi}
-%exclude %{python_sitearch}/PyKDE4/akonadi.so
 %files akonadi
 %{python_sitearch}/PyKDE4/akonadi.so
-%endif
 
 %files devel
 %{_kde4_bindir}/pykdeuic4
@@ -265,15 +259,30 @@ mv %{buildroot}%{_kde4_appsdir}/pykde4/examples/ %{buildroot}%{_docdir}/pykde4/
 %if 0%{?python3}
 %files -n python3-pykde4
 %doc COPYING
-%{python3_sitearch}/PyKDE4/
+%dir %{python3_sitearch}/PyKDE4/
+%{python3_sitearch}PyKDE4/__init__.py*
+%{python3_sitearch}PyKDE4/__pycache__/
+%{python3_sitearch}PyKDE4/dnssd.so
+%{python3_sitearch}PyKDE4/kdecore.so
+%{python3_sitearch}PyKDE4/kdeui.so
+%{python3_sitearch}PyKDE4/khtml.so
+%{python3_sitearch}PyKDE4/kio.so
+%{python3_sitearch}PyKDE4/knewstuff.so
+%{python3_sitearch}PyKDE4/kparts.so
+%{python3_sitearch}PyKDE4/kterminal.so
+%{python3_sitearch}PyKDE4/ktexteditor.so
+%{python3_sitearch}PyKDE4/kutils.so
+%{python3_sitearch}PyKDE4/nepomuk.so
+%{python3_sitearch}PyKDE4/phonon.so
+%{python3_sitearch}PyKDE4/plasma.so
+%{python3_sitearch}PyKDE4/pykdeconfig.py
+%{python3_sitearch}PyKDE4/solid.so
+%{python3_sitearch}PyKDE4/soprano.so
 %{python3_sitearch}/PyQt4/uic/widget-plugins/*
-%dir %{_docdir}/python3-pykde4
+%dir %{_docdir}/python3-pykde4/
 
-%if 0%{?pykde4_akonadi}
-%exclude %{python3_sitearch}/PyKDE4/akonadi.so
 %files -n python3-pykde4-akonadi
 %{python3_sitearch}/PyKDE4/akonadi.so
-%endif
 
 %files -n python3-pykde4-devel
 %{_kde4_bindir}/pykdeuic4-%{python3_version}
@@ -285,6 +294,9 @@ mv %{buildroot}%{_kde4_appsdir}/pykde4/examples/ %{buildroot}%{_docdir}/pykde4/
 
 
 %changelog
+* Mon Feb 17 2014 Rex Dieter <rdieter at fedoraproject.org> 4.12.2-4
+- drop pykde4_akonadi macro usage
+
 * Mon Feb 17 2014 Rex Dieter <rdieter at fedoraproject.org> 4.12.2-3
 - flesh out python(3)-kde4 related Provides