From 658f08ef412209bf2a8147b2769c9500ac8dbbed Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 7 Nov 2008 04:51:41 +0000 Subject: [PATCH 1/4] Initialize branch F-10 for wallpapoz --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..dc32377 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-10 From 1b8a2486e16ab256cdf6707138d1d32e44254297 Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Sat, 29 Aug 2009 17:02:04 +0000 Subject: [PATCH 2/4] - Update to rev 92 - Install desktop application autostart stuff on F-12+ --- .cvsignore | 2 +- daemon_wallpapoz-wrapper | 13 +++++++++++ sources | 2 +- wallpapoz.spec | 48 ++++++++++++++++++++++++++++++++++++---- 4 files changed, 59 insertions(+), 6 deletions(-) create mode 100644 daemon_wallpapoz-wrapper diff --git a/.cvsignore b/.cvsignore index 7053e9c..3522c65 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -wallpapoz-0.4.1-svn87_trunk.tar.bz2 +wallpapoz-0.4.1-svn92_trunk.tar.bz2 diff --git a/daemon_wallpapoz-wrapper b/daemon_wallpapoz-wrapper new file mode 100644 index 0000000..76a92cc --- /dev/null +++ b/daemon_wallpapoz-wrapper @@ -0,0 +1,13 @@ +#!/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 "$@" diff --git a/sources b/sources index 6758522..e1f4d70 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -dcdc89bee9b1e35e000f99f104a39774 wallpapoz-0.4.1-svn87_trunk.tar.bz2 +5a993e9618690681805124f78c141170 wallpapoz-0.4.1-svn92_trunk.tar.bz2 diff --git a/wallpapoz.spec b/wallpapoz.spec index 623dc0e..21f25b0 100644 --- a/wallpapoz.spec +++ b/wallpapoz.spec @@ -1,5 +1,5 @@ # For svn version: do -# $ svn checkout http://opensvn.csie.org/wallpapoz/trunk wallpapoz-%%{mainver} +# $ svn checkout http://opensvn.csie.org/wallpapoz/trunk wallpapoz-%%{mainver}%%{?svnver:-svn%%svnver} # $ tar -cjf %%{name}-%%{mainver}%%{?svnver:-svn%%svnver}.tar.bz2 %%{name}-%%{mainver}/ %define srcurl http://wallpapoz.akbarhome.com/ @@ -7,8 +7,8 @@ %define mainver 0.4.1 %undefine betaver -%define svnver svn87_trunk -%define fedorarel 7 +%define svnver svn92_trunk +%define fedorarel 10 %define rel %{?betaver:0.}%{fedorarel}%{?svnver:.%svnver}%{?betaver:.%betaver} @@ -21,6 +21,10 @@ Group: User Interface/Desktops License: GPLv2+ URL: %{srcurl} Source0: %{srcurl}files/%{name}-%{mainver}%{?svnver:-%svnver}%{?betaver:%betaver}.tar.bz2 +Source10: daemon_wallpapoz-wrapper +%if 0%{?fedora} >= 12 +Source11: wallpapoz-autostart.desktop +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -51,7 +55,6 @@ wallpapers for different workspaces or virtual desktops. %prep %setup -q -n %{name}-%{version}%{?svnver:-%svnver} -sed -i.cs -e '/DOC_ISO_CODES/s|"ru"|"ru","cs"|' setup.py %build @@ -69,6 +72,22 @@ desktop-file-install \ --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 + +# Install desktop application autostart stuff +%if 0%{?fedora} >= 12 +mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/xdg/autostart +desktop-file-install \ + --dir ${RPM_BUILD_ROOT}%{_sysconfdir}/xdg/autostart \ + %{SOURCE11} +%endif + %{find_lang} %{name} %clean @@ -78,6 +97,11 @@ desktop-file-install \ %defattr(-,root,root,-) %doc COPYING README %{_bindir}/*%{name} +%{_libexecdir}/daemon_wallpapoz + +%if 0%{?fedora} >= 12 +%{_sysconfdir}/xdg/autostart/wallpapoz-autostart.desktop +%endif %{_datadir}/%{name}/ %{_datadir}/gnome/help/%{name}/ @@ -86,6 +110,22 @@ desktop-file-install \ %{_datadir}/applications/fedora-%{name}.desktop %changelog +* Sun Aug 30 2009 Mamoru Tasaka - 0.4.1-10.svn92_trunk +- Update to rev 92 +- Install desktop application autostart stuff on F-12+ + +* Sat Jul 25 2009 Mamoru Tasaka - 0.4.1-9.svn87_trunk +- F-12: Mass rebuild + +* Tue Feb 24 2009 Mamoru Tasaka +- F-11: Mass rebuild + +* Wed Jan 21 2009 Mamoru Tasaka - 0.4.1-8.svn87_trunk +- Always once kill daemon_wallpapoz process if it exists before start + +* Mon Dec 01 2008 Ignacio Vazquez-Abrams +- F-11: Rebuild for Python 2.6 + * Wed Aug 27 2008 Mamoru Tasaka - 0.4.1-7.svn87_trunk - F-10+: Add (Build)Requires: gnome-python2-gnome (bug 456122, 460022) From f39c52ba5ac3707ba802f2e11cba362c9ba9773e Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:15:04 +0000 Subject: [PATCH 3/4] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index de8ef26..0195116 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := wallpapoz SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From b40f30daabaf18585505acc5b61bb4dece6f6a3c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:12:03 +0000 Subject: [PATCH 4/4] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 0195116..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: wallpapoz -# $Id$ -NAME := wallpapoz -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index dc32377..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-10