rpms/wallpapoz/devel daemon_wallpapoz-wrapper, NONE, 1.1 wallpapoz.spec, 1.20, 1.21

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/wallpapoz/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21072

Modified Files:
	wallpapoz.spec 
Added Files:
	daemon_wallpapoz-wrapper 
Log Message:
* Wed Jan 21 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.1-8.svn87_trunk
- Always once kill daemon_wallpapoz process if it exists before start



--- NEW FILE daemon_wallpapoz-wrapper ---
#!/bin/sh

pgrep -U $(id -u) -f daemon_wallpapoz | while read daemon_pid
do
	pgrep -U $(id -u) -f python | while read python_pid
	do
		if [ $daemon_pid = $python_pid ]
		then
			/usr/bin/kill -SIGTERM $daemon_pid
		fi
	done
done
exec /usr/libexec/daemon_wallpapoz "$@"


Index: wallpapoz.spec
===================================================================
RCS file: /cvs/extras/rpms/wallpapoz/devel/wallpapoz.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- wallpapoz.spec	1 Dec 2008 15:00:55 -0000	1.20
+++ wallpapoz.spec	20 Jan 2009 16:41:31 -0000	1.21
@@ -8,19 +8,20 @@
 %define         mainver         0.4.1
 %undefine         betaver
 %define         svnver          svn87_trunk
-%define         fedorarel       7
+%define         fedorarel       8
 
 %define         rel             %{?betaver:0.}%{fedorarel}%{?svnver:.%svnver}%{?betaver:.%betaver}
 
 Name:           wallpapoz
 Version:        %{mainver}
-Release:        %{rel}%{?dist}.1
+Release:        %{rel}%{?dist}
 Summary:        Gnome Multi Backgrounds and Wallpapers Configuration Tool
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            %{srcurl}
 Source0:        %{srcurl}files/%{name}-%{mainver}%{?svnver:-%svnver}%{?betaver:%betaver}.tar.bz2
+Source10:       daemon_wallpapoz-wrapper
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -69,6 +70,14 @@
    --delete-original \
    $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
+# Install daemon_wallpapoz-wrapper, move the original one
+# to %%_libexecdir
+%{__mkdir_p} $RPM_BUILD_ROOT%{_libexecdir}
+%{__mv} $RPM_BUILD_ROOT%{_bindir}/daemon_wallpapoz \
+	$RPM_BUILD_ROOT%{_libexecdir}/
+%{__install} -cpm 0755 %{SOURCE10} \
+	$RPM_BUILD_ROOT%{_bindir}/daemon_wallpapoz
+
 %{find_lang} %{name}
 
 %clean
@@ -78,6 +87,7 @@
 %defattr(-,root,root,-)
 %doc COPYING README
 %{_bindir}/*%{name}
+%{_libexecdir}/daemon_wallpapoz
 
 %{_datadir}/%{name}/
 %{_datadir}/gnome/help/%{name}/
@@ -86,8 +96,11 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
-* Mon Dec 01 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.4.1-7.svn87_trunk.1
-- Rebuild for Python 2.6
+* Wed Jan 21 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.1-8.svn87_trunk
+- Always once kill daemon_wallpapoz process if it exists before start
+
+* Mon Dec 01 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com>
+- F-11: Rebuild for Python 2.6
 
 * Wed Aug 27 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.1-7.svn87_trunk
 - F-10+: Add (Build)Requires: gnome-python2-gnome (bug 456122, 460022)