rpms/grhino/FC-6 grhino-omf.patch, NONE, 1.1 grhino-scrollkeeper.patch, NONE, 1.1 grhino.spec, 1.7, 1.8 sources, 1.6, 1.7 grhino-Makefile-in.patch, 1.3, NONE

Michel Alexandre Salim (salimma) fedora-extras-commits at redhat.com
Sun Oct 29 19:59:09 UTC 2006


Author: salimma

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

Modified Files:
	grhino.spec sources 
Added Files:
	grhino-omf.patch grhino-scrollkeeper.patch 
Removed Files:
	grhino-Makefile-in.patch 
Log Message:
Update to 0.15.2


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-6/grhino.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- grhino.spec	29 Oct 2006 17:32:50 -0000	1.7
+++ grhino.spec	29 Oct 2006 19:58:39 -0000	1.8
@@ -1,20 +1,20 @@
 Name:           grhino
-Version:        0.15.0
-Release:        6%{?dist}
+Version:        0.15.2
+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
+Source0:        http://dl.sourceforge.net/rhino/grhino-%{version}.tar.gz
 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:	gettext
 BuildRequires:  libgnomeui-devel
 BuildRequires:	scrollkeeper
 #Requires:       
@@ -38,8 +38,9 @@
 
 %prep
 %setup -q
-%patch0 -p1
+%patch0
 %patch1 -p1
+%patch2
 
 
 %build
@@ -86,8 +87,14 @@
 
 
 %changelog
-* Sun Oct 29 2006 Michel Salim <michel.salim at gmail.com> - 0.15.0-6
-- Rebuild for Fedora Extras 6
+* 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
 
 * Thu Mar  2 2006 Michel Salim <michel.salim at gmail.com> - 0.15.0-5
 - Rebuild for Fedora Extras 5


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-6/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	29 Oct 2006 17:32:50 -0000	1.6
+++ sources	29 Oct 2006 19:58:39 -0000	1.7
@@ -1 +1 @@
-8995401592c3534bc7645b577d28963c  grhino-0.15.0-patched.tar.bz2
+9eb1e09b4ce8ca7e354382c7dd2d3ddc  grhino-0.15.2.tar.gz


--- grhino-Makefile-in.patch DELETED ---




More information about the fedora-extras-commits mailing list