rpms/kdeaddons/devel kdeaddons.spec,1.67,1.68

Kevin Kofler (kkofler) fedora-extras-commits at redhat.com
Tue Dec 11 13:57:28 UTC 2007


Author: kkofler

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

Modified Files:
	kdeaddons.spec 
Log Message:
* Tue Dec 11 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.5.8-4
- disable noatun plugins (F9+)

Note: This is a quick fix for the broken deps. We have to figure out what to do with the rest of kdeaddons later, my plan is to:
* rename kdeaddons-extras to kdeaddons-atlantikdesigner now that only that is left
* drop the main kdeaddons package as kicker applets etc. are useless now
* have extragear-plasma Obsolete kdeaddons
* package ksig from extragear/pim to replace the one in kdeaddons (the one still useful app in the main package)


Index: kdeaddons.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeaddons/devel/kdeaddons.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- kdeaddons.spec	25 Oct 2007 02:56:54 -0000	1.67
+++ kdeaddons.spec	11 Dec 2007 13:56:50 -0000	1.68
@@ -2,7 +2,7 @@
 Name:    kdeaddons
 Summary: K Desktop Environment - Plugins
 Version: 3.5.8
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 Group: User Interface/Desktops
@@ -17,7 +17,9 @@
 
 BuildRequires: kdebase3-devel >= %{version}
 BuildRequires: kdegames3-devel >= %{version}
+%if 0%{?fedora} < 9
 BuildRequires: kdemultimedia3-devel >= %{version}
+%endif
 BuildRequires: kdepim3-devel >= %{version}
 BuildRequires: SDL-devel
 BuildRequires: alsa-lib-devel
@@ -51,7 +53,9 @@
 %description extras
 This package includes:
 * atlantikdesigner: game board designer
+%if 0%{?fedora} < 9
 * noatun-plugins
+%endif
 
 
 %prep
@@ -65,6 +69,9 @@
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
+%if 0%{?fedora} >= 9
+export DO_NOT_COMPILE="noatun-plugins"
+%endif
 
 %configure \
   --includedir=%{_includedir}/kde \
@@ -168,7 +175,6 @@
 %{_datadir}/apps/mediacontrol/
 %{_datadir}/apps/metabar/
 %{_datadir}/apps/microformat/
-%{_datadir}/apps/noatun/*
 %{_datadir}/apps/kicker/applets/*
 %{_datadir}/apps/ksig/
 %{_datadir}/config*/*
@@ -183,10 +189,11 @@
 %exclude %{_datadir}/icons/hicolor/*/*/atlantikdesigner*
 %exclude %{_datadir}/applications/kde/atlantikdesigner.desktop
 
+%if 0%{?fedora} < 9
 # noatun-plugins
 %exclude %{_bindir}/noatun*
 %exclude %{_libdir}/kde3/noatun*
-%exclude %{_datadir}/apps/noatun/*
+%endif
 
 
 %files extras
@@ -199,13 +206,18 @@
 %{_datadir}/icons/hicolor/*/*/atlantikdesigner*
 %{_datadir}/applications/kde/atlantikdesigner.desktop
 
+%if 0%{?fedora} < 9
 # noatun-plugins
 %{_bindir}/noatun*
 %{_libdir}/kde3/noatun*
 %{_datadir}/apps/noatun/*
+%endif
 
 
 %changelog
+* Tue Dec 11 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.5.8-4
+- disable noatun plugins (F9+)
+
 * Wed Oct 24 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.5.8-2
 - -extras: Requires: kdegames3
 




More information about the fedora-extras-commits mailing list