rpms/grhino/FC-6 grhino-Makefile-in.patch, 1.2, 1.3 grhino.spec, 1.6, 1.7 sources, 1.5, 1.6
Michel Alexandre Salim (salimma)
fedora-extras-commits at redhat.com
Sun Oct 29 17:33:21 UTC 2006
Author: salimma
Update of /cvs/extras/rpms/grhino/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20638
Modified Files:
grhino.spec sources
Added Files:
grhino-Makefile-in.patch
Log Message:
Reverting to 0.15.0 for now until build problem inside mock fixed
grhino-Makefile-in.patch:
Index: grhino-Makefile-in.patch
===================================================================
RCS file: grhino-Makefile-in.patch
diff -N grhino-Makefile-in.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ grhino-Makefile-in.patch 29 Oct 2006 17:32:50 -0000 1.3
@@ -0,0 +1,152 @@
+diff -ru grhino-0.15.0-orig/Makefile.in grhino-0.15.0/Makefile.in
+--- grhino-0.15.0-orig/Makefile.in 2005-04-15 09:03:04.000000000 -0500
++++ grhino-0.15.0/Makefile.in 2005-08-20 16:33:54.000000000 -0500
+@@ -444,82 +444,82 @@
+ $(adBeginSubdir) $@ $(adEndSubdir)
+
+ install_mkdir :
+- if [ ! -e "$(bindir)" ]; then \
+- mkdir -p "$(bindir)"; \
+- chmod 755 "$(bindir)"; \
+- fi
+- if [ ! -e "$(pattern_dir)" ]; then \
+- mkdir -p "$(pattern_dir)"; \
+- chmod 755 "$(pattern_dir)"; \
+- fi
+- if [ ! -e "$(book_dir)" ]; then \
+- mkdir -p "$(book_dir)"; \
+- chmod 755 "$(book_dir)"; \
+- fi
+- if [ ! -e "$(theme_dir)" ]; then \
+- mkdir -p "$(theme_dir)"; \
+- chmod 755 "$(theme_dir)"; \
+- fi
+- if [ ! -e "$(theme_dir)/small" ]; then \
+- mkdir -p "$(theme_dir)/small"; \
+- chmod 755 "$(theme_dir)/small"; \
+- fi
+- if [ ! -e "$(helpdir)" ]; then \
+- mkdir -p "$(helpdir)"; \
+- chmod 755 "$(helpdir)"; \
+- fi
+- if [ ! -e "$(helpdir)/C" ]; then \
+- mkdir -p "$(helpdir)/C"; \
+- chmod 755 "$(helpdir)/C"; \
+- fi
+- if [ ! -e "$(helpdir)/C/figures" ]; then \
+- mkdir -p "$(helpdir)/C/figures"; \
+- chmod 755 "$(helpdir)/C/figures"; \
++ if [ ! -e "$(DESTDIR)$(bindir)" ]; then \
++ mkdir -p "$(DESTDIR)$(bindir)"; \
++ chmod 755 "$(DESTDIR)$(bindir)"; \
++ fi
++ if [ ! -e "$(DESTDIR)$(pattern_dir)" ]; then \
++ mkdir -p "$(DESTDIR)$(pattern_dir)"; \
++ chmod 755 "$(DESTDIR)$(pattern_dir)"; \
++ fi
++ if [ ! -e "$(DESTDIR)$(book_dir)" ]; then \
++ mkdir -p "$(DESTDIR)$(book_dir)"; \
++ chmod 755 "$(DESTDIR)$(book_dir)"; \
++ fi
++ if [ ! -e "$(DESTDIR)$(theme_dir)" ]; then \
++ mkdir -p "$(DESTDIR)$(theme_dir)"; \
++ chmod 755 "$(DESTDIR)$(theme_dir)"; \
++ fi
++ if [ ! -e "$(DESTDIR)$(theme_dir)/small" ]; then \
++ mkdir -p "$(DESTDIR)$(theme_dir)/small"; \
++ chmod 755 "$(DESTDIR)$(theme_dir)/small"; \
++ fi
++ if [ ! -e "$(DESTDIR)$(helpdir)" ]; then \
++ mkdir -p "$(DESTDIR)$(helpdir)"; \
++ chmod 755 "$(DESTDIR)$(helpdir)"; \
++ fi
++ if [ ! -e "$(DESTDIR)$(helpdir)/C" ]; then \
++ mkdir -p "$(DESTDIR)$(helpdir)/C"; \
++ chmod 755 "$(DESTDIR)$(helpdir)/C"; \
++ fi
++ if [ ! -e "$(DESTDIR)$(helpdir)/C/figures" ]; then \
++ mkdir -p "$(DESTDIR)$(helpdir)/C/figures"; \
++ chmod 755 "$(DESTDIR)$(helpdir)/C/figures"; \
+ fi
+
+ install : install_mkdir
+- -$(INSTALL_PROGRAM) grhino "$(bindir)/grhino"
+- -$(INSTALL_PROGRAM) gtp-rhino "$(bindir)/gtp-rhino"
+- $(INSTALL_DATA) "$(srcdir)/row1.bin" "$(pattern_dir)/row1.bin"
+- $(INSTALL_DATA) "$(srcdir)/row2.bin" "$(pattern_dir)/row2.bin"
+- $(INSTALL_DATA) "$(srcdir)/row3.bin" "$(pattern_dir)/row3.bin"
+- $(INSTALL_DATA) "$(srcdir)/row4.bin" "$(pattern_dir)/row4.bin"
+- $(INSTALL_DATA) "$(srcdir)/diag1.bin" "$(pattern_dir)/diag1.bin"
+- $(INSTALL_DATA) "$(srcdir)/diag2.bin" "$(pattern_dir)/diag2.bin"
+- $(INSTALL_DATA) "$(srcdir)/diag3.bin" "$(pattern_dir)/diag3.bin"
+- $(INSTALL_DATA) "$(srcdir)/diag4.bin" "$(pattern_dir)/diag4.bin"
+- $(INSTALL_DATA) "$(srcdir)/diag5.bin" "$(pattern_dir)/diag5.bin"
+- $(INSTALL_DATA) "$(srcdir)/corner5x2.bin" "$(pattern_dir)/corner5x2.bin"
+- $(INSTALL_DATA) "$(srcdir)/book.bin" "$(book_dir)/book.bin"
+- $(INSTALL_DATA) "$(srcdir)/help/C/legal.xml" "$(helpdir)/C/legal.xml"
+- -scrollkeeper-preinstall "$(helpdir)/C/grhino.xml" \
+- "$(srcdir)/help/C/grhino-C.omf.in" "$(helpdir)/C/grhino-C.omf"
+- $(INSTALL_DATA) "$(srcdir)/help/C/grhino.xml" "$(helpdir)/C/grhino.xml"
++ -$(INSTALL_PROGRAM) grhino "$(DESTDIR)$(bindir)/grhino"
++ -$(INSTALL_PROGRAM) gtp-rhino "$(DESTDIR)$(bindir)/gtp-rhino"
++ $(INSTALL_DATA) "$(srcdir)/row1.bin" "$(DESTDIR)$(pattern_dir)/row1.bin"
++ $(INSTALL_DATA) "$(srcdir)/row2.bin" "$(DESTDIR)$(pattern_dir)/row2.bin"
++ $(INSTALL_DATA) "$(srcdir)/row3.bin" "$(DESTDIR)$(pattern_dir)/row3.bin"
++ $(INSTALL_DATA) "$(srcdir)/row4.bin" "$(DESTDIR)$(pattern_dir)/row4.bin"
++ $(INSTALL_DATA) "$(srcdir)/diag1.bin" "$(DESTDIR)$(pattern_dir)/diag1.bin"
++ $(INSTALL_DATA) "$(srcdir)/diag2.bin" "$(DESTDIR)$(pattern_dir)/diag2.bin"
++ $(INSTALL_DATA) "$(srcdir)/diag3.bin" "$(DESTDIR)$(pattern_dir)/diag3.bin"
++ $(INSTALL_DATA) "$(srcdir)/diag4.bin" "$(DESTDIR)$(pattern_dir)/diag4.bin"
++ $(INSTALL_DATA) "$(srcdir)/diag5.bin" "$(DESTDIR)$(pattern_dir)/diag5.bin"
++ $(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" \
++ "$(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" \
+- "$(helpdir)/C/figures/gamelist.png"
++ "$(DESTDIR)$(helpdir)/C/figures/gamelist.png"
+ $(INSTALL_DATA) "$(srcdir)/help/C/figures/history.png" \
+- "$(helpdir)/C/figures/history.png"
++ "$(DESTDIR)$(helpdir)/C/figures/history.png"
+ $(INSTALL_DATA) "$(srcdir)/help/C/figures/mainwindow.png" \
+- "$(helpdir)/C/figures/mainwindow.png"
++ "$(DESTDIR)$(helpdir)/C/figures/mainwindow.png"
+ $(INSTALL_DATA) "$(srcdir)/help/C/figures/pattern.png" \
+- "$(helpdir)/C/figures/pattern.png"
++ "$(DESTDIR)$(helpdir)/C/figures/pattern.png"
+ $(INSTALL_DATA) "$(srcdir)/help/C/figures/prefs-ai.png" \
+- "$(helpdir)/C/figures/prefs-ai.png"
++ "$(DESTDIR)$(helpdir)/C/figures/prefs-ai.png"
+ $(INSTALL_DATA) "$(srcdir)/help/C/figures/prefs-board.png" \
+- "$(helpdir)/C/figures/prefs-board.png"
++ "$(DESTDIR)$(helpdir)/C/figures/prefs-board.png"
+ $(INSTALL_DATA) "$(srcdir)/help/C/figures/prefs-theme.png" \
+- "$(helpdir)/C/figures/prefs-theme.png"
+- $(INSTALL_DATA) "$(srcdir)/theme/small/black.xpm" "$(theme_dir)/small/black.xpm"
+- $(INSTALL_DATA) "$(srcdir)/theme/small/black_last.xpm" "$(theme_dir)/small/black_last.xpm"
+- $(INSTALL_DATA) "$(srcdir)/theme/small/bottom.xpm" "$(theme_dir)/small/bottom.xpm"
+- $(INSTALL_DATA) "$(srcdir)/theme/small/empty.xpm" "$(theme_dir)/small/empty.xpm"
+- $(INSTALL_DATA) "$(srcdir)/theme/small/hint_black.xpm" "$(theme_dir)/small/hint_black.xpm"
+- $(INSTALL_DATA) "$(srcdir)/theme/small/hint_white.xpm" "$(theme_dir)/small/hint_white.xpm"
+- $(INSTALL_DATA) "$(srcdir)/theme/small/left.xpm" "$(theme_dir)/small/left.xpm"
+- $(INSTALL_DATA) "$(srcdir)/theme/small/right.xpm" "$(theme_dir)/small/right.xpm"
+- $(INSTALL_DATA) "$(srcdir)/theme/small/top.xpm" "$(theme_dir)/small/top.xpm"
+- $(INSTALL_DATA) "$(srcdir)/theme/small/white.xpm" "$(theme_dir)/small/white.xpm"
+- $(INSTALL_DATA) "$(srcdir)/theme/small/white_last.xpm" "$(theme_dir)/small/white_last.xpm"
++ "$(DESTDIR)$(helpdir)/C/figures/prefs-theme.png"
++ $(INSTALL_DATA) "$(srcdir)/theme/small/black.xpm" "$(DESTDIR)$(theme_dir)/small/black.xpm"
++ $(INSTALL_DATA) "$(srcdir)/theme/small/black_last.xpm" "$(DESTDIR)$(theme_dir)/small/black_last.xpm"
++ $(INSTALL_DATA) "$(srcdir)/theme/small/bottom.xpm" "$(DESTDIR)$(theme_dir)/small/bottom.xpm"
++ $(INSTALL_DATA) "$(srcdir)/theme/small/empty.xpm" "$(DESTDIR)$(theme_dir)/small/empty.xpm"
++ $(INSTALL_DATA) "$(srcdir)/theme/small/hint_black.xpm" "$(DESTDIR)$(theme_dir)/small/hint_black.xpm"
++ $(INSTALL_DATA) "$(srcdir)/theme/small/hint_white.xpm" "$(DESTDIR)$(theme_dir)/small/hint_white.xpm"
++ $(INSTALL_DATA) "$(srcdir)/theme/small/left.xpm" "$(DESTDIR)$(theme_dir)/small/left.xpm"
++ $(INSTALL_DATA) "$(srcdir)/theme/small/right.xpm" "$(DESTDIR)$(theme_dir)/small/right.xpm"
++ $(INSTALL_DATA) "$(srcdir)/theme/small/top.xpm" "$(DESTDIR)$(theme_dir)/small/top.xpm"
++ $(INSTALL_DATA) "$(srcdir)/theme/small/white.xpm" "$(DESTDIR)$(theme_dir)/small/white.xpm"
++ $(INSTALL_DATA) "$(srcdir)/theme/small/white_last.xpm" "$(DESTDIR)$(theme_dir)/small/white_last.xpm"
+ if [ ! "@GMSGFMT@" = ":" ]; then \
+ cd po; \
+ $(MAKE) prefix="$(prefix)" DESTDIR="$(DESTDIR)" install; \
Index: grhino.spec
===================================================================
RCS file: /cvs/extras/rpms/grhino/FC-6/grhino.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- grhino.spec 10 Oct 2006 01:06:57 -0000 1.6
+++ grhino.spec 29 Oct 2006 17:32:50 -0000 1.7
@@ -1,20 +1,20 @@
Name: grhino
-Version: 0.15.2
-Release: 2%{?dist}
+Version: 0.15.0
+Release: 6%{?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
+Source0: grhino-%{version}-patched.tar.bz2
Source1: %{name}.desktop
-#Patch0: grhino-Makefile-in.patch
+Patch0: grhino-Makefile-in.patch
Patch1: grhino-configure-gettext.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,7 +38,7 @@
%prep
%setup -q
-#%patch0 -p1
+%patch0 -p1
%patch1 -p1
@@ -86,11 +86,8 @@
%changelog
-* 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
+* Sun Oct 29 2006 Michel Salim <michel.salim at gmail.com> - 0.15.0-6
+- Rebuild for Fedora Extras 6
* 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 8 Oct 2006 14:11:36 -0000 1.5
+++ sources 29 Oct 2006 17:32:50 -0000 1.6
@@ -1 +1 @@
-9eb1e09b4ce8ca7e354382c7dd2d3ddc grhino-0.15.2.tar.gz
+8995401592c3534bc7645b577d28963c grhino-0.15.0-patched.tar.bz2
More information about the fedora-extras-commits
mailing list