rpms/grhino/FC-4 grhino-omf.patch, NONE, 1.1 grhino-scrollkeeper.patch, NONE, 1.1 grhino.spec, 1.5, 1.6

[Michel Alexandre Salim (salimma)]

Author: salimma

Update of /cvs/extras/rpms/grhino/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31731/FC-4

Modified Files:
	grhino.spec 
Added Files:
	grhino-omf.patch grhino-scrollkeeper.patch 
Log Message:
Update other trees to 0.15.2 as well


grhino-omf.patch:

--- NEW FILE grhino-omf.patch ---
--- help/C/grhino-C.omf.in.orig	2006-08-10 10:57:38.000000000 -0400
+++ help/C/grhino-C.omf.in	2006-10-29 14:34:06.000000000 -0500
@@ -16,7 +16,7 @@
    2006-08-10
   </date>
   <version identifier="0.15.2" date="2006-08-10" description="OMF for GRhino 0.15.2"/>
-  <subject category="GRhino"/>
+  <subject category="Applications|Games|Board"/>
   <description>
     User manual for GRhino Othello/Reversi game
   </description>

grhino-scrollkeeper.patch:

--- NEW FILE grhino-scrollkeeper.patch ---
--- Makefile.in.orig	2006-08-10 10:57:38.000000000 -0400
+++ Makefile.in	2006-10-29 14:32:58.000000000 -0500
@@ -495,7 +495,7 @@
 	$(INSTALL_DATA) "$(srcdir)/corner5x2.bin" "$(DESTDIR)$(pattern_dir)/corner5x2.bin"
 	$(INSTALL_DATA) "$(srcdir)/book.bin" "$(DESTDIR)$(book_dir)/book.bin"
 	$(INSTALL_DATA) "$(srcdir)/help/C/legal.xml" "$(DESTDIR)$(helpdir)/C/legal.xml"
-	-scrollkeeper-preinstall "$(DESTDIR)$(helpdir)/C/grhino.xml" \
+	-scrollkeeper-preinstall "$(helpdir)/C/grhino.xml" \
 		"$(srcdir)/help/C/grhino-C.omf.in" "$(DESTDIR)$(helpdir)/C/grhino-C.omf"
 	$(INSTALL_DATA) "$(srcdir)/help/C/grhino.xml" "$(DESTDIR)$(helpdir)/C/grhino.xml"
 	$(INSTALL_DATA) "$(srcdir)/help/C/figures/gamelist.png" \
--- ad.append.orig	2006-08-10 10:57:38.000000000 -0400
+++ ad.append	2006-10-29 14:32:33.000000000 -0500
@@ -107,9 +107,10 @@
 	$(INSTALL_DATA) "$(srcdir)/corner5x2.bin" "$(DESTDIR)$(pattern_dir)/corner5x2.bin"
 	$(INSTALL_DATA) "$(srcdir)/book.bin" "$(DESTDIR)$(book_dir)/book.bin"
 	$(INSTALL_DATA) "$(srcdir)/help/C/legal.xml" "$(DESTDIR)$(helpdir)/C/legal.xml"
-	-scrollkeeper-preinstall "$(DESTDIR)$(helpdir)/C/grhino.xml" \
+	-scrollkeeper-preinstall "$(helpdir}/C/grhino.xml" \
 		"$(srcdir)/help/C/grhino-C.omf.in" "$(DESTDIR)$(helpdir)/C/grhino-C.omf"
-	$(INSTALL_DATA) "$(srcdir)/help/C/grhino.xml" "$(DESTDIR)$(helpdir)/C/grhino.xml"
+	$(INSTALL_DATA) "$(srcdir)/help/C/grhino.xml" \
+		"$(DESTDIR)$(helpdir)/C/grhino.xml"
 	$(INSTALL_DATA) "$(srcdir)/help/C/figures/gamelist.png" \
 		"$(DESTDIR)$(helpdir)/C/figures/gamelist.png"
 	$(INSTALL_DATA) "$(srcdir)/help/C/figures/history.png" \


Index: grhino.spec
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-4/grhino.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- grhino.spec	8 Oct 2006 14:11:35 -0000	1.5
+++ grhino.spec	29 Oct 2006 20:15:19 -0000	1.6
@@ -1,19 +1,20 @@
 Name:           grhino
 Version:        0.15.2
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Reversi game for GNOME, supporting the Go/Game Text Protocol
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://rhino.sourceforge.net/
 Source0:        http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz
-#Source0:	grhino-%{version}-patched.tar.bz2
 Source1:	%{name}.desktop
-#Patch0:		grhino-Makefile-in.patch
+Patch0:		grhino-scrollkeeper.patch
 Patch1:		grhino-configure-gettext.patch
+Patch2:		grhino-omf.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
+BuildRequires:	gettext
 BuildRequires:  libgnomeui-devel
 BuildRequires:	scrollkeeper
 #Requires:       
@@ -37,8 +38,9 @@
 
 %prep
 %setup -q
-#%patch0 -p1
+%patch0
 %patch1 -p1
+%patch2
 
 
 %build
@@ -85,6 +87,12 @@
 
 
 %changelog
+* Sun Oct 29 2006 Michel Salim <michel.salim at gmail.com> - 0.15.2-3
+- Fix incorrect OMF path
+
+* Mon Oct  9 2006 Michel Salim <michel.salim at gmail.com> - 0.15.2-2
+- BuildRequire on gettext
+
 * Sun Oct  8 2006 Michel Salim <michel.salim at gmail.com> - 0.15.2-1
 - Update to 0.15.2