diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index bbca299..0000000 --- a/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -wallpapoz-0.4.1.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 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 cbbe506..af7d2d0 100644 --- a/wallpapoz.spec +++ b/wallpapoz.spec @@ -7,9 +7,10 @@ %define mainver 0.4.1 %undefine betaver -%define fedorarel 2 +%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} @@ -19,7 +20,7 @@ Summary: Gnome Multi Backgrounds and Wallpapers Configuration Tool Group: User Interface/Desktops 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 @@ -42,7 +43,8 @@ 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} +sed -i.cs -e '/DOC_ISO_CODES/s|"ru"|"ru","cs"|' setup.py %build @@ -52,6 +54,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 \ @@ -75,6 +79,16 @@ 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 + +* 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