packages (DEVEL): kde4-kdeplasma-addons/kde4-kdeplasma-addons.spec - better...

[shadzik]

Author: shadzik                      Date: Thu Jul 23 08:26:00 2009 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- better
- add bcond without marble
- change marblde-devel BR to kde4-kdeedu-devel

---- Files affected:
packages/kde4-kdeplasma-addons:
   kde4-kdeplasma-addons.spec (1.23.2.13 -> 1.23.2.14) 

---- Diffs:

================================================================
Index: packages/kde4-kdeplasma-addons/kde4-kdeplasma-addons.spec
diff -u packages/kde4-kdeplasma-addons/kde4-kdeplasma-addons.spec:1.23.2.13 packages/kde4-kdeplasma-addons/kde4-kdeplasma-addons.spec:1.23.2.14
--- packages/kde4-kdeplasma-addons/kde4-kdeplasma-addons.spec:1.23.2.13	Wed Jul 22 18:32:41 2009
+++ packages/kde4-kdeplasma-addons/kde4-kdeplasma-addons.spec	Thu Jul 23 10:25:54 2009
@@ -1,4 +1,7 @@
 # $Revision$, $Date$
+
+%bcond_without	marble	# don't build marble plasma support
+
 %define		orgname	kdeplasma-addons
 %define		_state	unstable
 %define		_qtver	4.5.2
@@ -32,7 +35,7 @@
 BuildRequires:	kde4-kdegraphics-devel >= %{version}
 BuildRequires:	kde4-kdelibs-devel >= %{version}
 BuildRequires:	kde4-kdepimlibs-devel >= %{version}
-BuildRequires:	marble-devel >= 0.7.1
+%{?with_marble:BuildRequires:	kde4-kdeedu-devel >= %{version}}
 BuildRequires:	phonon-devel >= 4.3.1
 BuildRequires:	qt4-build >= %{_qtver}
 BuildRequires:	qt4-qmake >= %{_qtver}
@@ -132,7 +135,9 @@
 %attr(755,root,root) %{_libdir}/kde4/plasma_potd_oseiprovider.so
 %attr(755,root,root) %{_libdir}/kde4/plasma_potd_wcpotdprovider.so
 %attr(755,root,root) %{_libdir}/kde4/plasma_wallpaper_mandelbrot.so
+%if %{with marble}
 %attr(755,root,root) %{_libdir}/kde4/plasma_wallpaper_marble.so
+%endif
 %attr(755,root,root) %{_libdir}/kde4/plasma_wallpaper_pattern.so
 %attr(755,root,root) %{_libdir}/kde4/plasma_wallpaper_virus.so
 %attr(755,root,root) %{_libdir}/kde4/plasma_wallpaper_weather.so
@@ -217,6 +222,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.23.2.14  2009/07/23 08:25:54  shadzik
+- better
+- add bcond without marble
+- change marblde-devel BR to kde4-kdeedu-devel
+
 Revision 1.23.2.13  2009/07/22 16:32:41  shadzik
 - BR: marble-devel
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdeplasma-addons/kde4-kdeplasma-addons.spec?r1=1.23.2.13&r2=1.23.2.14&f=u