packages: kde4-kdeplasma-addons/kde4-kdeplasma-addons.spec - merged from DEVEL

shadzik shadzik at pld-linux.org
Thu Feb 18 16:44:34 CET 2010 

Author: shadzik                      Date: Thu Feb 18 15:44:34 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- merged from DEVEL

---- Files affected:
packages/kde4-kdeplasma-addons:
   kde4-kdeplasma-addons.spec (1.39 -> 1.40) 

---- Diffs:

================================================================
Index: packages/kde4-kdeplasma-addons/kde4-kdeplasma-addons.spec
diff -u packages/kde4-kdeplasma-addons/kde4-kdeplasma-addons.spec:1.39 packages/kde4-kdeplasma-addons/kde4-kdeplasma-addons.spec:1.40
--- packages/kde4-kdeplasma-addons/kde4-kdeplasma-addons.spec:1.39	Thu Jan 28 23:54:27 2010
+++ packages/kde4-kdeplasma-addons/kde4-kdeplasma-addons.spec	Thu Feb 18 16:44:28 2010
@@ -1,53 +1,52 @@
 # $Revision$, $Date$
+# TODO:
+# Lancelot: installed - cmake unimplemented because not found
+#   * XRender - Lancelot compositing support
+#   * Eigen2 - Eigen2 enables the Mandelbrot wallpaper plugin.
 
 %bcond_without	marble	# don't build marble plasma support
 
-%define		orgname	kdeplasma-addons
-%define		_state	stable
-%define		_qtver	4.5.3
+%define		orgname	    kdeplasma-addons
+%define		_state	    stable
+%define		qtver	    4.6.1
 
 Summary:	KDE4 Plasmoids
 Summary(pl.UTF-8):	Plazmoidy dla KDE4
 Name:		kde4-kdeplasma-addons
-Version:	4.3.5
+Version:	4.4.0
 Release:	1
 License:	GPL v2
 Group:		X11/Applications
 Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2
-# Source0-md5:	cc1dbdc54760f3e7ded6ca6a717ee6da
-#Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2
+# Source0-md5:	0a990a833a8a7c5434d158b0b18c5ad2
 Patch100:	%{name}-branch.diff
 Patch0:		%{name}-pastebinpld.patch
 URL:		http://www.kde.org/
 BuildRequires:	OpenGL-GLU-devel
 BuildRequires:	OpenGL-devel
-BuildRequires:	QtCore-devel >= %{_qtver}
-BuildRequires:	QtNetwork-devel >= %{_qtver}
-BuildRequires:	QtOpenGL-devel >= %{_qtver}
-BuildRequires:	QtScript-devel >= %{_qtver}
-BuildRequires:	QtSvg-devel >= %{_qtver}
-BuildRequires:	QtWebKit-devel >= %{_qtver}
+BuildRequires:	QtCore-devel >= %{qtver}
+BuildRequires:	QtNetwork-devel >= %{qtver}
+BuildRequires:	QtOpenGL-devel >= %{qtver}
+BuildRequires:	QtScript-devel >= %{qtver}
+BuildRequires:	QtSvg-devel >= %{qtver}
+BuildRequires:	QtWebKit-devel >= %{qtver}
 BuildRequires:	automoc4 >= 0.9.88
-BuildRequires:	cmake >= 2.6.3
+BuildRequires:	cmake >= 2.8.0
 BuildRequires:	eigen-devel >= 2.0.51
 BuildRequires:	kde4-kdebase-workspace-devel >= %{version}
 %{?with_marble:BuildRequires:	kde4-kdeedu-devel >= %{version}}
 BuildRequires:	kde4-kdegraphics-devel >= %{version}
 BuildRequires:	kde4-kdelibs-devel >= %{version}
 BuildRequires:	kde4-kdepimlibs-devel >= %{version}
-BuildRequires:	phonon-devel >= 4.3.1
-BuildRequires:	pkgconfig
-BuildRequires:	python
-BuildRequires:	python-modules
-BuildRequires:	qimageblitz-devel
-BuildRequires:	qt4-build >= %{_qtver}
-BuildRequires:	qt4-qmake >= %{_qtver}
+BuildRequires:	phonon-devel >= 4.3.80
+BuildRequires:	qt4-build >= %{qtver}
+BuildRequires:	qt4-qmake >= %{qtver}
 BuildRequires:	rpmbuild(macros) >= 1.293
-BuildRequires:	soprano-devel
-BuildRequires:	strigi-devel >= 0.6.5
-BuildRequires:	xorg-lib-libXcomposite
-BuildRequires:	xorg-lib-libXdamage
-BuildRequires:	xorg-lib-libXrender
+BuildRequires:	shared-desktop-ontologies-devel >= 0.2
+BuildRequires:	strigi-devel >= 0.7.0
+BuildRequires:	xorg-lib-libXcomposite-devel
+BuildRequires:	xorg-lib-libXdamage-devel
+BuildRequires:	xorg-lib-libXrender-devel
 BuildRequires:	xorg-lib-libXtst-devel
 Obsoletes:	kde4-kdeplasmoids
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -145,11 +144,11 @@
 %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
-%attr(755,root,root) %ghost %{_libdir}/libconversion.so.?
-%attr(755,root,root) %{_libdir}/libconversion.so.*.*.*
+#%attr(755,root,root) %ghost %{_libdir}/libconversion.so.?
+#%attr(755,root,root) %{_libdir}/libconversion.so.*.*.*
 %attr(755,root,root) %{_libdir}/liblancelot.so
-%attr(755,root,root) %ghost %{_libdir}/libocsclient.so.?
-%attr(755,root,root) %{_libdir}/libocsclient.so.*.*.*
+#%attr(755,root,root) %ghost %{_libdir}/libocsclient.so.?
+#%attr(755,root,root) %{_libdir}/libocsclient.so.*.*.*
 %attr(755,root,root) %{_libdir}/libplasmacomicprovidercore.so
 %attr(755,root,root) %ghost %{_libdir}/libplasmapotdprovidercore.so.?
 %attr(755,root,root) %{_libdir}/libplasmapotdprovidercore.so.*.*.*
@@ -173,6 +172,7 @@
 %{_datadir}/kde4/servicetypes/plasma_comicprovider.desktop
 %{_datadir}/kde4/servicetypes/plasma_potdprovider.desktop
 %{_datadir}/config/comic.knsrc
+%{_datadir}/config/plasmaweather.knsrc
 %{_datadir}/config/virus_wallpaper.knsrc
 %dir %{_datadir}/apps/desktoptheme/default/rssnow
 %{_datadir}/apps/desktoptheme/default/rssnow/background.svgz
@@ -182,8 +182,11 @@
 %dir %{_datadir}/apps/desktoptheme/default/bubblemon
 %{_datadir}/apps/desktoptheme/default/bubblemon/bubble.svg
 %dir %{_datadir}/apps/desktoptheme/default/fifteenPuzzle
-%{_datadir}/apps/desktoptheme/default/fifteenPuzzle/greensquare.svgz
+%{_datadir}/apps/desktoptheme/default/fifteenPuzzle/blanksquare.svg
 %{_iconsdir}/hicolor/scalable/apps/fifteenpuzzle.svgz
+%{_iconsdir}/hicolor/scalable/apps/accessories-dictionary.svgz
+%{_iconsdir}/hicolor/scalable/apps/bball.svgz
+%{_iconsdir}/oxygen/*x*/apps/qalculate-applet.png
 
 %dir %{_datadir}/apps/rssnow
 %{_datadir}/apps/rssnow/feeds
@@ -191,11 +194,14 @@
 %{_datadir}/kde4/services/ServiceMenus/preview.desktop
 %dir %{_datadir}/apps/bball
 %{_datadir}/apps/bball/bball.svgz
+%{_iconsdir}/*/*x*/apps/bball.png
 %{_datadir}/apps/bball/bounce.ogg
 %{_datadir}/apps/bball/football.svgz
 #%{_datadir}/apps/plasma-bluemarble
 %{_datadir}/apps/plasma
 %{_datadir}/apps/plasma-applet-opendesktop
+%{_datadir}/apps/plasma-applet-opendesktop-activities
+%{_datadir}/apps/plasma-applet-frame
 %{_datadir}/apps/plasma_pastebin
 %{_datadir}/apps/plasma_wallpaper_pattern
 
@@ -205,6 +211,7 @@
 %attr(755,root,root) %ghost %{_libdir}/liblancelot.so.?
 %attr(755,root,root) %{_libdir}/liblancelot.so.*.*.*
 %{_datadir}/apps/desktoptheme/default/lancelot
+%{_datadir}/apps/desktoptheme/oxygen/lancelot
 #%{_datadir}/apps/desktoptheme/air/
 
 %{_datadir}/dbus-1/services/org.kde.lancelot.service
@@ -216,9 +223,9 @@
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/*.so
-%{_includedir}/conversion
+#%{_includedir}/conversion
 %{_includedir}/lancelot
-%{_datadir}/apps/cmake/modules/*.cmake
+#%{_datadir}/apps/cmake/modules/*.cmake
 
 %define	date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -226,26 +233,51 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.39  2010/01/28 22:54:27  shadzik
-- 4.3.5
+Revision 1.40  2010/02/18 15:44:28  shadzik
+- merged from DEVEL
 
-Revision 1.38  2009/12/03 19:40:53  sparky
-- BR: soprano-devel
+Revision 1.32.2.14  2010/02/04 22:04:37  arekm
+- up to 4.4.0
 
-Revision 1.37  2009/12/03 00:08:15  sparky
-- BR: pkgconfig, python, python-modules, qimageblitz-devel
+Revision 1.32.2.13  2010/02/02 20:56:17  shadzik
+- bump up qtver; it's not necessary but we make sure we link with the latest qtver
 
-Revision 1.36  2009/11/28 20:53:11  shadzik
-- 4.3.4
+Revision 1.32.2.12  2010/02/02 20:49:00  shadzik
+- unify qtver makro
 
-Revision 1.35  2009/10/31 14:30:46  shadzik
-- 4.3.3
+Revision 1.32.2.11  2010/02/02 16:01:21  shadzik
+- minor clean up (removing old svn snap stuff)
 
-Revision 1.34  2009/10/03 11:59:54  shadzik
-- updated qt BR
+Revision 1.32.2.10  2010/02/02 13:12:35  shadzik
+- force cmake 2.8.0 BR
 
-Revision 1.33  2009/10/03 11:45:59  shadzik
-- 4.3.2 try #1
+Revision 1.32.2.9  2010/02/01 02:21:49  shadzik
+- 4.4 RC3
+
+Revision 1.32.2.8  2010/01/20 10:02:20  arekm
+- up to 4.3.95
+
+Revision 1.32.2.7  2010/01/12 15:08:22  paszczus
+- updated to 4.4 RC1 (4.3.90)
+
+Revision 1.32.2.6  2009/12/24 02:13:26  shadzik
+- 4.4 Beta2
+
+Revision 1.32.2.5  2009/12/04 14:43:48  shadzik
+- updated BRs
+- rel 2
+
+Revision 1.32.2.4  2009/12/04 01:43:36  shadzik
+- 4.4 beta1
+
+Revision 1.32.2.3  2009/10/29 14:47:11  paszczus
+- updated to 4.3.73
+
+Revision 1.32.2.2  2009/10/19 07:55:48  paszczus
+- updated to 4.3.72
+
+Revision 1.32.2.1  2009/10/07 23:44:37  cactus
+- up to 4.3.69
 
 Revision 1.32  2009/08/29 15:29:24  shadzik
 - 4.3.1
================================================================

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

More information about the pld-cvs-commit mailing list