SPECS (Titanium): kernel-desktop.spec - duh! kernelupdatenotifier moved to ...

[glen]

Author: glen                         Date: Thu Mar 19 17:21:22 2009 GMT
Module: SPECS                         Tag: Titanium
---- Log message:
- duh! kernelupdatenotifier moved to separate spec: kde4-kernelupdatenotifier.spec

---- Files affected:
SPECS:
   kernel-desktop.spec (1.204.2.8 -> 1.204.2.9) 

---- Diffs:

================================================================
Index: SPECS/kernel-desktop.spec
diff -u SPECS/kernel-desktop.spec:1.204.2.8 SPECS/kernel-desktop.spec:1.204.2.9
--- SPECS/kernel-desktop.spec:1.204.2.8	Thu Mar 19 18:00:05 2009
+++ SPECS/kernel-desktop.spec	Thu Mar 19 18:21:16 2009
@@ -6,7 +6,6 @@
 %bcond_with	verbose		# verbose build (V=1)
 %bcond_with	pae		# build PAE (HIGHMEM64G) support on uniprocessor
 %bcond_with	laptop		# build for laptops - 100Hz
-%bcond_without	notifier	# don't build kernelupdatenotifier
 
 %{?debug:%define with_verbose 1}
 
@@ -50,8 +49,6 @@
 Source1:	http://www.kernel.org/pub/linux/kernel/v2.6/patch-%{version}.bz2
 # Source1-md5:	3edf81af0b4a48fc3a7c27101d11d67f
 %endif
-Source200:	kernelupdatenotifier-1.0.tar.gz
-# Source200-md5:	dc77fa4e127948a8c305edc5189f9bf0
 
 Source2:	kernel-desktop-autoconf.h
 Source3:	kernel-desktop-config.h
@@ -69,10 +66,6 @@
 
 #### End patches ##
 URL:		http://www.kernel.org/
-%if %{with notifier}
-BuildRequires:	kde4-kdelibs-devel
-BuildRequires:	kde4-kdebase-workspace-devel
-%endif
 BuildRequires:	binutils >= 3:2.18
 BuildRequires:	/sbin/depmod
 BuildRequires:	gcc >= 5:3.2
@@ -190,17 +183,6 @@
 
 %{Features}
 
-%package kde4-notifier
-Summary:	Kernel Update Notifier for KDE4
-Summary(pl.UTF-8):	Powiadomienie o zaktualizowanym kernelu dla KDE4
-Group:	X11/Application
-
-%description kde4-notifier
-Kernel Update Notifier for KDE4
-
-%description kde4-notifier -l pl.UTF-8
-Powiadomienie o zaktualizowanym kernelu dla KDE4
-
 %package vmlinux
 Summary:	vmlinux - uncompressed kernel image
 Summary(de.UTF-8):	vmlinux - dekompressiertes Kernel Bild
@@ -399,7 +381,7 @@
 /usr/src/linux/Documentation.
 
 %prep
-%setup -q -a200 -n linux-%{_basever}
+%setup -q -n linux-%{_basever}
 
 %if "%{_postver}" != "%{nil}"
 %{__bzip2} -dc %{SOURCE1} | patch -p1 -s
@@ -424,9 +406,6 @@
 find '(' -name '*~' -o -name '*.orig' -o -name '.gitignore' ')' -print0 | xargs -0 -r -l512 rm -f
 
 %build
-%if %{with notifier}
-%{__make} -C kernelupdatenotifier INCPATH+="-I/usr/include -I/usr/include/KDE" LIBS+="-lknotifyconfig -lkworkspace -lkdeui"
-%endif
 TuneUpConfigForIX86 () {
 	set -x
 %ifarch %{ix86}
@@ -562,12 +541,6 @@
 rm -rf $RPM_BUILD_ROOT
 umask 022
 
-%if %{with notifier}
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/apps/kernelupdatenotifier}
-install kernelupdatenotifier/*.notifyrc $RPM_BUILD_ROOT%{_datadir}/apps/kernelupdatenotifier/
-install kernelupdatenotifier/kernelupdatenotifier $RPM_BUILD_ROOT%{_bindir}
-%endif
-
 export DEPMOD=%DepMod
 
 install -d $RPM_BUILD_ROOT%{_kernelsrcdir}
@@ -661,9 +634,15 @@
 elif [ -x /sbin/rc-boot ]; then
 	/sbin/rc-boot 1>&2 || :
 fi
+
+# kde4-kernelupdatenotifier
 if [ -x /usr/bin/kernelupdatenotifier ]; then
-	KDE4_USER=$(ps aux |grep kded4 |grep -v grep |cut -d" " -f1)
-	su - $KDE4_USER -c "/usr/bin/kernelupdatenotifier %{version}"
+	# Send to all kde4 sessions
+	# XXX what about kde3 sessions?
+	# XXX: use dcop --all-sessions? --all-users?
+	for user in $(ps -o user= -C kded4 | sort -u); do
+		su -s /bin/sh -l $user -c "/usr/bin/kernelupdatenotifier %{version}"
+	done
 fi
 
 %post vmlinux
@@ -770,13 +749,6 @@
 %ghost /lib/modules/%{kernel_release}/source
 %dir %{_sysconfdir}/modprobe.d/%{kernel_release}
 
-%if %{with notifier}
-%files kde4-notifier
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/kernelupdatenotifier
-%{_datadir}/apps/kernelupdatenotifier
-%endif
-
 %files vmlinux
 %defattr(644,root,root,755)
 /boot/vmlinux-%{kernel_release}
@@ -970,6 +942,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.204.2.9  2009/03/19 17:21:16  glen
+- duh! kernelupdatenotifier moved to separate spec: kde4-kernelupdatenotifier.spec
+
 Revision 1.204.2.8  2009/03/19 17:00:05  shadzik
 - ehm fix files
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel-desktop.spec?r1=1.204.2.8&r2=1.204.2.9&f=u