rpms/wallpapoz/devel wallpapoz-0.4rc2-ignore-X.patch, NONE, 1.1 wallpapoz-ja.po.diff, NONE, 1.1 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 wallpapoz.spec, 1.5, 1.6 legal-ja.xml, 1.1, NONE wallpapoz-ja.xml, 1.1, NONE

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

Update of /cvs/extras/rpms/wallpapoz/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12769

Modified Files:
	.cvsignore sources wallpapoz.spec 
Added Files:
	wallpapoz-0.4rc2-ignore-X.patch wallpapoz-ja.po.diff 
Removed Files:
	legal-ja.xml wallpapoz-ja.xml 
Log Message:
* Tue Apr 17 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4-0.5.rc2
- 0.4 rc2


wallpapoz-0.4rc2-ignore-X.patch:

--- NEW FILE wallpapoz-0.4rc2-ignore-X.patch ---
--- 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:

wallpapoz-ja.po.diff:

--- NEW FILE wallpapoz-ja.po.diff ---
--- 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 <mtasaka at ioa.s.u-tokyo.ac.jp>\n"
 "Language-Team: Japanese <translation-team-ja at lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -326,7 +326,7 @@
 
 #: ../wallpapoz/glade/wallpapoz.glade:2177
 msgid "translator-credits"
-msgstr "翻訳者のクレジット"
+msgstr "田坂　守 <mtasaka at ioa.s.u-tokyo.ac.jp>"
 
 #: ../wallpapoz/glade/wallpapoz.glade:2185
 msgid "Choose Directory"


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wallpapoz/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	11 Apr 2007 06:57:38 -0000	1.4
+++ .cvsignore	15 May 2007 15:24:08 -0000	1.5
@@ -1 +1 @@
-wallpapoz-0.4-svn55.tar.bz2
+wallpapoz-0.4rc2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wallpapoz/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	11 Apr 2007 06:57:38 -0000	1.4
+++ sources	15 May 2007 15:24:08 -0000	1.5
@@ -1 +1 @@
-65b876faa0beb5118a030abb5504778b  wallpapoz-0.4-svn55.tar.bz2
+686be4e6af03a15e99f99f4ffec4dfdb  wallpapoz-0.4rc2.tar.bz2


Index: wallpapoz.spec
===================================================================
RCS file: /cvs/extras/rpms/wallpapoz/devel/wallpapoz.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wallpapoz.spec	17 Apr 2007 06:51:43 -0000	1.5
+++ wallpapoz.spec	15 May 2007 15:24:08 -0000	1.6
@@ -6,10 +6,10 @@
 %define         icondir         %{_datadir}/icons/hicolor/128x128/apps
 
 %define         mainver         0.4
-%define         svnver          55
-%define         fedorarel       4
+%define         betaver         rc2
+%define         fedorarel       5
 
-%define         rel             %{?svnver:0.}%{fedorarel}%{?svnver:.svn%svnver}
+%define         rel             %{?betaver:0.}%{fedorarel}%{?betaver:.%betaver}
 
 Name:           wallpapoz
 Version:        %{mainver}
@@ -19,9 +19,9 @@
 Group:          User Interface/Desktops
 License:        GPL
 URL:            %{srcurl}
-Source0:        %{srcurl}files/%{name}-%{mainver}%{?svnver:-svn%svnver}.tar.bz2
-Source1:	wallpapoz-ja.xml
-Source2:	legal-ja.xml
+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,17 +42,16 @@
 
 %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
 
-pushd share/gnome/help/wallpapoz/
-mkdir ja
-%{__install} -c -p -m 644 %{SOURCE1} ja/wallpapoz.xml
-%{__install} -c -p -m 644 %{SOURCE2} ja/legal.xml
-popd
-%{__sed} -i.lang -e '/DOC_ISO_CODES/s|(\(.*,\))|(\1 "ja",)|' setup.py
-
 %build
 
 %install
@@ -84,6 +83,9 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Tue Apr 17 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4-0.5.rc2
+- 0.4 rc2
+
 * Tue Apr 17 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4-0.4.svn55
 - Add Japanese xml files (upstream will merge this)
 


--- legal-ja.xml DELETED ---


--- wallpapoz-ja.xml DELETED ---