rpms/kdeplasma-addons/F-10 kdeplasma-addons-4.2.2-krunner_contacts_not_enabledbydefault.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 kdeplasma-addons.spec, 1.17, 1.18 sources, 1.13, 1.14 kdeplasma-addons-4.2.1-lancelot-qt45.patch, 1.1, NONE kdeplasma-addons-4.2.3-rssnow_qt451_hack.patch, 1.1, NONE

Rex Dieter rdieter at fedoraproject.org
Wed Aug 5 13:04:05 UTC 2009


Author: rdieter

Update of /cvs/pkgs/rpms/kdeplasma-addons/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13736/F-10

Modified Files:
	.cvsignore kdeplasma-addons.spec sources 
Added Files:
	kdeplasma-addons-4.2.2-krunner_contacts_not_enabledbydefault.patch 
Removed Files:
	kdeplasma-addons-4.2.1-lancelot-qt45.patch 
	kdeplasma-addons-4.2.3-rssnow_qt451_hack.patch 
Log Message:
kde-4.3.0


kdeplasma-addons-4.2.2-krunner_contacts_not_enabledbydefault.patch:
 plasma-runner-contacts.desktop |    1 -
 1 file changed, 1 deletion(-)

--- NEW FILE kdeplasma-addons-4.2.2-krunner_contacts_not_enabledbydefault.patch ---
diff -up kdeplasma-addons-4.2.2/runners/contacts/plasma-runner-contacts.desktop.disable_contacts_krunner kdeplasma-addons-4.2.2/runners/contacts/plasma-runner-contacts.desktop
--- kdeplasma-addons-4.2.2/runners/contacts/plasma-runner-contacts.desktop.disable_contacts_krunner	2009-03-26 09:43:17.000000000 -0500
+++ kdeplasma-addons-4.2.2/runners/contacts/plasma-runner-contacts.desktop	2009-04-30 14:43:36.820331028 -0500
@@ -92,4 +92,3 @@ X-KDE-PluginInfo-Email=tpr at iki.fi
 X-KDE-PluginInfo-Name=kabccontacts
 X-KDE-PluginInfo-Version=1.0
 X-KDE-PluginInfo-License=LGPL
-X-KDE-PluginInfo-EnabledByDefault=true


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeplasma-addons/F-10/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	31 May 2009 14:29:48 -0000	1.12
+++ .cvsignore	5 Aug 2009 13:04:05 -0000	1.13
@@ -1 +1,5 @@
-kdeplasma-addons-4.2.4.tar.bz2
+kdeplasma-addons-4.2.90.tar.bz2
+kdeplasma-addons-4.2.95.tar.bz2
+kdeplasma-addons-4.2.96.tar.bz2
+kdeplasma-addons-4.2.98.tar.bz2
+kdeplasma-addons-4.3.0.tar.bz2


Index: kdeplasma-addons.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeplasma-addons/F-10/kdeplasma-addons.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- kdeplasma-addons.spec	31 May 2009 14:29:48 -0000	1.17
+++ kdeplasma-addons.spec	5 Aug 2009 13:04:05 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           kdeplasma-addons
-Version:        4.2.4
-Release:        1%{?dist}
+Version:        4.3.0
+Release:        5%{?dist}
 Summary:        Additional plasmoids for KDE
 
 Group:          User Interface/Desktops
@@ -9,23 +9,34 @@ URL:            http://www.kde.org/
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdeplasma-addons-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# http://ivan.fomentgroup.org/blog/2009/03/09/patch-for-lancelot-and-qt4/
-# http://bugs.gentoo.org/258758
-Patch0:         kdeplasma-addons-4.2.1-lancelot-qt45.patch
-# http://bugzilla.redhat.com/497659
-Patch1:         kdeplasma-addons-4.2.3-rssnow_qt451_hack.patch
+## upstreamable patches
+# disable contacts krunner that induces mostly needless kres-migrator and
+# akonadi launch on first login
+Patch51: kdeplasma-addons-4.2.2-krunner_contacts_not_enabledbydefault.patch
+
+## upstream patches
 
 BuildRequires:  boost-devel
+BuildRequires:  eigen2-devel
 BuildRequires:  gettext
 BuildRequires:  kdepimlibs-devel >= %{version}
-# for libplasmaclock
+# for libplasmaclock, nepomuk
 BuildRequires:  kdebase-workspace-devel >= %{version}
+# RECOMMENDED: Marble is used to provide a desktop globe wallpaper for Plasma.
+BuildRequires:  kdeedu-devel >= %{version}
 %if 0%{?fedora} > 9
 # Optional (but recommended), enables automatic rotation for frame applet
 BuildRequires:  libkexiv2-devel >= 0.4.0
+# lancelot eye-candy
+BuildRequires:  libXcomposite-devel libXrender-devel libXdamage-devel
 %endif
-BuildRequires:  plasma-devel >= %{version}
 BuildRequires:  qimageblitz-devel
+BuildRequires:  soprano-devel
+
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+
+# when -libs was introduced
+Obsoletes: kdeplasma-addons < 4.3.0-3
 
 # most of former kdeaddons for KDE3 is now here
 Obsoletes: kdeaddons < 4
@@ -39,21 +50,27 @@ Provides: kdeplasmoids = %{version}-%{re
 Obsoletes: kde-plasma-lancelot < 4.0.80 
 Provides: kde-plasma-lancelot = %{version}-%{release}
 
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
+Obsoletes: kde-plasma-weather < 1.0.0-100
+Provides: kde-plasma-weather = 1.0.0-100
 
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 
 %description
 Additional plasmoids for KDE.
 
+%package libs
+Summary: Runtime libraries for %{name}
+Group:   System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: kdelibs4%{?_isa} >= %{version}
+%description libs
+%{summary}.
+
 
 %prep
 %setup -q -n kdeplasma-addons-%{version}
-%if 0%{?_qt45:1}
-%patch0 -p0 -b .lancelot-qt45
-%patch1 -p1 -b .rssnow_qt451_hack
-%endif
+
+%patch51 -p1 -b .krunner_contacts_not_enabledbydefault 
 
 
 %build
@@ -72,26 +89,34 @@ rm -rf %{buildroot}
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 # unpackaged files
-# omit -devel type stuff, for now
+# omit shlib symlinks 
 rm -f %{buildroot}%{_kde4_libdir}/libplasma*.so
+rm -f %{buildroot}%{_kde4_libdir}/lib{ocsclient,rtm}.so
+# lancelot-devel
 rm -f %{buildroot}%{_kde4_libdir}/liblancelot*.so
 rm -rf %{buildroot}%{_kde4_includedir}/lancelot
+# conversion-devel 
+rm -rf %{buildroot}%{_kde4_includedir}/conversion/
+rm -f  %{buildroot}%{_kde4_libdir}/libconversion.so
+rm -f  %{buildroot}%{_kde4_appsdir}/cmake/modules/FindConversion.cmake
 
 
 %post
-/sbin/ldconfig
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 
 %posttrans
 gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 
 %postun
-/sbin/ldconfig
 if [ $1 -eq 0 ] ; then
   touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
   gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 fi
 
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
 
 %clean
 rm -rf %{buildroot}
@@ -103,32 +128,78 @@ rm -rf %{buildroot}
 %{_kde4_bindir}/lancelot
 %{_kde4_appsdir}/bball/
 %{_kde4_appsdir}/desktoptheme/*
+%{_kde4_appsdir}/lancelot/
 %{_kde4_appsdir}/plasma/services/*
-%{_kde4_appsdir}/plasma-bluemarble/
+%{_kde4_appsdir}/plasma-applet-opendesktop/
+%{_kde4_appsdir}/plasma_pastebin/
+%{_kde4_appsdir}/plasma_wallpaper_pattern/
 %{_kde4_appsdir}/rssnow/
-%{_kde4_datadir}/config/comic.knsrc
+%{_kde4_configdir}/*.knsrc
 %{_kde4_datadir}/kde4/services/*.desktop
 %{_kde4_datadir}/kde4/services/ServiceMenus/*.desktop
 %{_kde4_datadir}/kde4/servicetypes/*.desktop
 %{_kde4_datadir}/mime/packages/lancelotpart-mime.xml
 %{_kde4_datadir}/dbus-1/services/org.kde.lancelot.service
 %{_kde4_libdir}/kde4/*.so
-%{_kde4_libdir}/liblancelot.so.*
-%{_kde4_libdir}/libplasmaconverter.so.*
-%{_kde4_libdir}/libplasmacomicprovidercore.so.*
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_iconsdir}/oxygen/*/*/*
 
+%files libs
+%defattr(-,root,root,-)
+%{_kde4_libdir}/libconversion.so.*
+%{_kde4_libdir}/libocsclient.so.*
+%{_kde4_libdir}/liblancelot.so.*
+%{_kde4_libdir}/libplasmapotdprovidercore.so.*
+%{_kde4_libdir}/libplasmacomicprovidercore.so.*
+%{_kde4_libdir}/libplasmaweather.so.*
+%{_kde4_libdir}/librtm.so.*
+
 
 %changelog
-* Sun May 31 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.4-1
-- KDE 4.2.4
+* Tue Aug 04 2009 Than Ngo <than at redhat.com> - 4.3.0-5
+- respin
+
+* Mon Aug 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-4
+- fix microblog post crasher (kdebug#202364)
+
+* Mon Aug 03 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-3
+- -libs subpkg to sanitize multilib
+
+* Sun Aug 02 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.0-2
+- fix to allow updating of status via microblog plasmoid 
+
+* Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
+- 4.3.0
+
+* Wed Jul 22 2009 Than Ngo <than at redhat.com> - 4.2.98-1
+- 4.3rc3
+
+* Thu Jul 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.96-2
+- BR: libXcomposite-devel (lancelot eye-candy)
+
+* Sun Jul 12 2009 Than Ngo <than at redhat.com> - 4.2.96-1
+- 4.3rc2
+
+* Fri Jun 26 2009 Than Ngo <than at redhat.com> - 4.2.95-1
+- 4.3rc1
+
+* Thu Jun 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.90-1
+- KDE-4.3 beta2 (4.2.90)
+
+* Mon May 25 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.85-4
+- BR: eigen2-devel soprano-devel
+
+* Tue May 19 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.85-3
+- BR kdeedu-devel (for Marble)
+
+* Sun May 17 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.85-2
+- Obsoletes/Provides: kde-plasma-weather
 
-* Mon May 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.3-2
-- hack around rssnow+qt-4.5.1 bugosity (kde#190651,rhbz#497659)
+* Wed May 13 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.85-1
+- KDE 4.3 beta 1
 
-* Fri May 08 2009 Than Ngo <than at redhat.com> - 4.2.3-1
-- 4.2.3
+* Thu Apr 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-3
+- disable contacts krunner by default
 
 * Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
 - optimize scriptlets


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeplasma-addons/F-10/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	31 May 2009 14:29:48 -0000	1.13
+++ sources	5 Aug 2009 13:04:05 -0000	1.14
@@ -1 +1 @@
-8cd684126de488203f644bb59af60ac2  kdeplasma-addons-4.2.4.tar.bz2
+74369a3346c95368a62dc5a1490ed886  kdeplasma-addons-4.3.0.tar.bz2


--- kdeplasma-addons-4.2.1-lancelot-qt45.patch DELETED ---


--- kdeplasma-addons-4.2.3-rssnow_qt451_hack.patch DELETED ---




More information about the fedora-extras-commits mailing list