diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index 06f458a..0000000 --- a/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -wallpapoz-0.4rc2.tar.bz2 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..7053e9c --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +wallpapoz-0.4.1-svn87_trunk.tar.bz2 diff --git a/Makefile b/Makefile deleted file mode 100644 index de8ef26..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 $$/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/sources b/sources index 394bd0f..6758522 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -686be4e6af03a15e99f99f4ffec4dfdb wallpapoz-0.4rc2.tar.bz2 +dcdc89bee9b1e35e000f99f104a39774 wallpapoz-0.4.1-svn87_trunk.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..af7d2d0 100644 --- a/wallpapoz.spec +++ b/wallpapoz.spec @@ -5,11 +5,12 @@ %define srcurl http://wallpapoz.akbarhome.com/ %define icondir %{_datadir}/icons/hicolor/128x128/apps -%define mainver 0.4 -%define betaver rc2 +%define mainver 0.4.1 +%undefine betaver +%define svnver svn87_trunk %define fedorarel 5 -%define rel %{?betaver:0.}%{fedorarel}%{?betaver:.%betaver} +%define rel %{?betaver:0.}%{fedorarel}%{?svnver:.%svnver}%{?betaver:.%betaver} Name: wallpapoz Version: %{mainver} @@ -17,11 +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 -Patch0: wallpapoz-0.4rc2-ignore-X.patch -Patch1: wallpapoz-ja.po.diff +Source0: %{srcurl}files/%{name}-%{mainver}%{?svnver:-%svnver}%{?betaver:%betaver}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -35,22 +34,17 @@ BuildRequires: gnome-python2 Requires: pygtk2-libglade Requires: python-imaging Requires: gnome-python2 +Requires: xorg-x11-utils +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 -%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 +%setup -q -n %{name}-%{version}%{?svnver:-%svnver} +sed -i.cs -e '/DOC_ISO_CODES/s|"ru"|"ru","cs"|' setup.py %build @@ -60,6 +54,8 @@ touch -r COPYING.dos COPYING %{__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 \ @@ -83,7 +79,33 @@ desktop-file-install \ %{_datadir}/applications/fedora-%{name}.desktop %changelog -* Tue Apr 17 2007 Mamoru Tasaka - 0.4-0.5.rc2 +* 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 + +* 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 + +* 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! + +* 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