From 3f7df4383aefd28357448b06c83b140932e3618a Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 18 May 2007 11:02:08 +0000 Subject: [PATCH 1/8] Initialize branch F-7 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..c48525c --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-7 From 6218d28f979aa3c7f721259178bbefb803894cfe Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Thu, 31 May 2007 07:43:34 +0000 Subject: [PATCH 2/8] - 0.4 release! --- .cvsignore | 2 +- sources | 2 +- wallpapoz-0.4rc2-ignore-X.patch | 15 --------------- wallpapoz-ja.po.diff | 20 -------------------- wallpapoz.spec | 23 +++++++++-------------- 5 files changed, 11 insertions(+), 51 deletions(-) delete mode 100644 wallpapoz-0.4rc2-ignore-X.patch delete mode 100644 wallpapoz-ja.po.diff diff --git a/.cvsignore b/.cvsignore index 06f458a..c8b1c3f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -wallpapoz-0.4rc2.tar.bz2 +wallpapoz-0.4.tar.bz2 diff --git a/sources b/sources index 394bd0f..19df639 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -686be4e6af03a15e99f99f4ffec4dfdb wallpapoz-0.4rc2.tar.bz2 +6155f48a556a33e35ff4915f9a511da8 wallpapoz-0.4.tar.bz2 diff --git a/wallpapoz-0.4rc2-ignore-X.patch b/wallpapoz-0.4rc2-ignore-X.patch deleted file mode 100644 index 6539e31..0000000 --- a/wallpapoz-0.4rc2-ignore-X.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- wallpapoz-0.4/setup.py.X 2007-04-23 14:05:42.000000000 +0900 -+++ wallpapoz-0.4/setup.py 2007-05-15 22:54:14.000000000 +0900 -@@ -82,12 +82,6 @@ - print " !!! PyGTK .................... ", _("Not found") - required_found = False - try: -- import gtk.glade -- print " Python Glade ........................ OK" -- except ImportError: -- print " !!! Python Glade .................... ", _("Not found") -- required_found = False -- try: - import Image - print " Python Imaging Library ....... OK" - except ImportError: diff --git a/wallpapoz-ja.po.diff b/wallpapoz-ja.po.diff deleted file mode 100644 index 0292b6c..0000000 --- a/wallpapoz-ja.po.diff +++ /dev/null @@ -1,20 +0,0 @@ ---- wallpapoz.po.orig 2007-04-23 14:05:25.000000000 +0900 -+++ wallpapoz.po 2007-05-15 23:06:48.000000000 +0900 -@@ -8,7 +8,7 @@ - "Project-Id-Version: wallpapoz 0.4\n" - "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2007-04-01 00:51+0700\n" --"PO-Revision-Date: 2007-04-06 02:36+0900\n" -+"PO-Revision-Date: 2007-05-15 23:06+0900\n" - "Last-Translator: Mamoru Tasaka \n" - "Language-Team: Japanese \n" - "MIME-Version: 1.0\n" -@@ -326,7 +326,7 @@ - - #: ../wallpapoz/glade/wallpapoz.glade:2177 - msgid "translator-credits" --msgstr "翻訳者のクレジット" -+msgstr "田坂　守 " - - #: ../wallpapoz/glade/wallpapoz.glade:2185 - msgid "Choose Directory" diff --git a/wallpapoz.spec b/wallpapoz.spec index 7a298a4..38471b3 100644 --- a/wallpapoz.spec +++ b/wallpapoz.spec @@ -6,8 +6,8 @@ %define icondir %{_datadir}/icons/hicolor/128x128/apps %define mainver 0.4 -%define betaver rc2 -%define fedorarel 5 +%undefine betaver +%define fedorarel 1 %define rel %{?betaver:0.}%{fedorarel}%{?betaver:.%betaver} @@ -20,8 +20,6 @@ Group: User Interface/Desktops License: GPL URL: %{srcurl} Source0: %{srcurl}files/%{name}-%{mainver}%{?betaver:%betaver}.tar.bz2 -Patch0: wallpapoz-0.4rc2-ignore-X.patch -Patch1: wallpapoz-ja.po.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -42,15 +40,6 @@ wallpapers for different workspaces or virtual desktops. %prep %setup -q -%patch0 -p1 -b .X - -pushd share/locale/ja/LC_MESSAGES -%patch1 -p0 -b .pofix -msgfmt --verbose -o wallpapoz.mo wallpapoz.po -popd - -%{__sed} -i.dos -e 's|\r||g' COPYING -touch -r COPYING.dos COPYING %build @@ -83,7 +72,13 @@ desktop-file-install \ %{_datadir}/applications/fedora-%{name}.desktop %changelog -* Tue Apr 17 2007 Mamoru Tasaka - 0.4-0.5.rc2 +* Thu May 31 2007 Mamoru Tasaka - 0.4-1 +- 0.4 release! + +* Wed May 23 2007 Mamoru Tasaka - 0.4-0.5.svn69 +- svn 69 + +* Wed May 16 2007 Mamoru Tasaka - 0.4-0.5.rc2 - 0.4 rc2 * Tue Apr 17 2007 Mamoru Tasaka - 0.4-0.4.svn55 From f1912608f953509d6f38813c6f3fa0cfac91810c Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Sun, 3 Jun 2007 15:49:18 +0000 Subject: [PATCH 3/8] - Require xorg-x11-utils (bug 242349) --- wallpapoz.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/wallpapoz.spec b/wallpapoz.spec index 38471b3..b283fad 100644 --- a/wallpapoz.spec +++ b/wallpapoz.spec @@ -7,7 +7,7 @@ %define mainver 0.4 %undefine betaver -%define fedorarel 1 +%define fedorarel 2 %define rel %{?betaver:0.}%{fedorarel}%{?betaver:.%betaver} @@ -33,6 +33,8 @@ BuildRequires: gnome-python2 Requires: pygtk2-libglade Requires: python-imaging Requires: gnome-python2 +Requires: xorg-x11-utils +Requires: yelp %description This tool enables your Gnome desktop to have different @@ -72,6 +74,9 @@ desktop-file-install \ %{_datadir}/applications/fedora-%{name}.desktop %changelog +* Mon Jun 4 2007 Mamoru Tasaka - 0.4-2 +- Require xorg-x11-utils (bug 242349) + * Thu May 31 2007 Mamoru Tasaka - 0.4-1 - 0.4 release! From 78e57548b5fd1ae653cc6d0d048dc2fcf8f5faf5 Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Thu, 14 Jun 2007 04:50:08 +0000 Subject: [PATCH 4/8] - 0.4.1 --- .cvsignore | 2 +- sources | 2 +- wallpapoz.spec | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index c8b1c3f..bbca299 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -wallpapoz-0.4.tar.bz2 +wallpapoz-0.4.1.tar.bz2 diff --git a/sources b/sources index 19df639..6799c9a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6155f48a556a33e35ff4915f9a511da8 wallpapoz-0.4.tar.bz2 +63a32917840f912648f9e01bfd1f178f wallpapoz-0.4.1.tar.bz2 diff --git a/wallpapoz.spec b/wallpapoz.spec index b283fad..d0eb2ab 100644 --- a/wallpapoz.spec +++ b/wallpapoz.spec @@ -5,9 +5,9 @@ %define srcurl http://wallpapoz.akbarhome.com/ %define icondir %{_datadir}/icons/hicolor/128x128/apps -%define mainver 0.4 +%define mainver 0.4.1 %undefine betaver -%define fedorarel 2 +%define fedorarel 1 %define rel %{?betaver:0.}%{fedorarel}%{?betaver:.%betaver} @@ -74,6 +74,9 @@ desktop-file-install \ %{_datadir}/applications/fedora-%{name}.desktop %changelog +* Thu Jun 14 2007 Mamoru Tasaka - 0.4.1-1 +- 0.4.1 + * Mon Jun 4 2007 Mamoru Tasaka - 0.4-2 - Require xorg-x11-utils (bug 242349) From 57dfa5a48d7baff3886a0c2169b699899fa1cb53 Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Mon, 31 Mar 2008 16:36:38 +0000 Subject: [PATCH 5/8] - Update to latest svn per requests from upstream to support 2 more locales --- .cvsignore | 2 +- sources | 2 +- wallpapoz.spec | 27 +++++++++++++++++++++------ 3 files changed, 23 insertions(+), 8 deletions(-) diff --git a/.cvsignore b/.cvsignore index bbca299..7053e9c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -wallpapoz-0.4.1.tar.bz2 +wallpapoz-0.4.1-svn87_trunk.tar.bz2 diff --git a/sources b/sources index 6799c9a..6758522 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -63a32917840f912648f9e01bfd1f178f wallpapoz-0.4.1.tar.bz2 +dcdc89bee9b1e35e000f99f104a39774 wallpapoz-0.4.1-svn87_trunk.tar.bz2 diff --git a/wallpapoz.spec b/wallpapoz.spec index d0eb2ab..3229086 100644 --- a/wallpapoz.spec +++ b/wallpapoz.spec @@ -7,9 +7,10 @@ %define mainver 0.4.1 %undefine betaver -%define fedorarel 1 +%define svnver svn87_trunk +%define fedorarel 4 -%define rel %{?betaver:0.}%{fedorarel}%{?betaver:.%betaver} +%define rel %{?betaver:0.}%{fedorarel}%{?svnver:.%svnver}%{?betaver:.%betaver} Name: wallpapoz Version: %{mainver} @@ -17,9 +18,9 @@ Release: %{rel}%{?dist} Summary: Gnome Multi Backgrounds and Wallpapers Configuration Tool Group: User Interface/Desktops -License: GPL +License: GPLv2+ URL: %{srcurl} -Source0: %{srcurl}files/%{name}-%{mainver}%{?betaver:%betaver}.tar.bz2 +Source0: %{srcurl}files/%{name}-%{mainver}%{?svnver:-%svnver}%{?betaver:%betaver}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -34,14 +35,15 @@ Requires: pygtk2-libglade Requires: python-imaging Requires: gnome-python2 Requires: xorg-x11-utils -Requires: yelp +Requires: %{_bindir}/kill +Requires: %{_bindir}/pgrep %description This tool enables your Gnome desktop to have different wallpapers for different workspaces or virtual desktops. %prep -%setup -q +%setup -q -n %{name}-%{version}%{?svnver:-%svnver} %build @@ -51,6 +53,8 @@ wallpapers for different workspaces or virtual desktops. %{__python} setup.py install --installdir=$RPM_BUILD_ROOT%{_prefix} +%{__sed} -i -e 's|%{name}\.png|%{name}|' \ + $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop desktop-file-install \ --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ @@ -74,6 +78,17 @@ desktop-file-install \ %{_datadir}/applications/fedora-%{name}.desktop %changelog +* Tue Apr 1 2008 Mamoru Tasaka - 0.4.1-4.svn87_trunk +- Update to latest svn per requests from upstream to support + 2 more locales + +* Wed Dec 5 2007 Mamoru Tasaka - 0.4.1-3 +- Fix icon path in desktop file for desktop-file-utils 0.14+ + +* Fri Oct 5 2007 Mamoru Tasaka - 0.4.1-2 +- License update +- Drop yelp dependency + * Thu Jun 14 2007 Mamoru Tasaka - 0.4.1-1 - 0.4.1 From 53b7fcaccb15a8d41b65b3969f6d028153aa98ba Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Thu, 3 Apr 2008 07:36:15 +0000 Subject: [PATCH 6/8] - Also install cs documents manually --- wallpapoz.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/wallpapoz.spec b/wallpapoz.spec index 3229086..af7d2d0 100644 --- a/wallpapoz.spec +++ b/wallpapoz.spec @@ -8,7 +8,7 @@ %define mainver 0.4.1 %undefine betaver %define svnver svn87_trunk -%define fedorarel 4 +%define fedorarel 5 %define rel %{?betaver:0.}%{fedorarel}%{?svnver:.%svnver}%{?betaver:.%betaver} @@ -44,6 +44,7 @@ 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 @@ -78,6 +79,9 @@ desktop-file-install \ %{_datadir}/applications/fedora-%{name}.desktop %changelog +* Thu Apr 3 2008 Mamoru Tasaka - 0.4.1-5.svn87_trunk +- Also install cs documents manually + * Tue Apr 1 2008 Mamoru Tasaka - 0.4.1-4.svn87_trunk - Update to latest svn per requests from upstream to support 2 more locales From 0305097374d61c1170a28ab921ac37f091f7b6f2 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:15:05 +0000 Subject: [PATCH 7/8] 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 a81a4c48818f9740d21801032fc0723efd16d81a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:11:58 +0000 Subject: [PATCH 8/8] 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 c48525c..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-7