rpms/xarchon/devel xarchon-0.50-extraqual.patch, NONE, 1.1 xarchon-destdir.patch, NONE, 1.1 xarchon-fonts.patch, NONE, 1.1 xarchon.desktop, NONE, 1.1 xarchon.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Hans de Goede (jwrdegoede)
fedora-extras-commits at redhat.com
Mon May 15 18:49:43 UTC 2006
Author: jwrdegoede
Update of /cvs/extras/rpms/xarchon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11678/devel
Modified Files:
.cvsignore sources
Added Files:
xarchon-0.50-extraqual.patch xarchon-destdir.patch
xarchon-fonts.patch xarchon.desktop xarchon.spec
Log Message:
auto-import xarchon-0.50-2 on branch devel from xarchon-0.50-2.src.rpm
xarchon-0.50-extraqual.patch:
--- NEW FILE xarchon-0.50-extraqual.patch ---
--- src/Xarchon_Genetic.hpp~ 1999-10-09 20:00:56.000000000 +0300
+++ src/Xarchon_Genetic.hpp 2006-03-14 23:46:15.000000000 +0200
@@ -82,8 +82,8 @@
Xarchon_Genetic_Generation *gg;
public:
Xarchon_Evolution(char *test,char *pop,int num);
- Genetic_Population<Xarchon_Goal_Test> *Xarchon_Evolution::Operate(Genetic_Population<Xarchon_Goal_Test> *p);
- Genetic_Population<Xarchon_Goal_Test> *Xarchon_Evolution::Operate(void);
+ Genetic_Population<Xarchon_Goal_Test> *Operate(Genetic_Population<Xarchon_Goal_Test> *p);
+ Genetic_Population<Xarchon_Goal_Test> *Operate(void);
virtual ~Xarchon_Evolution(void);
};
xarchon-destdir.patch:
--- NEW FILE xarchon-destdir.patch ---
--- data/Makefile.am~ 1999-10-16 01:33:45.000000000 +0300
+++ data/Makefile.am 2003-09-14 14:32:25.000000000 +0300
@@ -7,8 +7,8 @@
echo "--> Installing theme '$$theme'"; \
THEME_DIRS=`find $$theme -type d`; \
for p in $$THEME_DIRS; do \
- echo "mkdir $(pkgdatadir)/$$p"; \
- mkdir $(pkgdatadir)/$$p; \
+ echo "mkdir $(DESTDIR)$(pkgdatadir)/$$p"; \
+ mkdir $(DESTDIR)$(pkgdatadir)/$$p; \
done; \
THEME_FILES=`find $$theme -type f`; \
for p in $$THEME_FILES; do \
--- data/Makefile.in~ 1999-12-03 19:12:06.000000000 +0200
+++ data/Makefile.in 2003-09-14 14:43:46.000000000 +0300
@@ -210,8 +210,8 @@
echo "--> Installing theme '$$theme'"; \
THEME_DIRS=`find $$theme -type d`; \
for p in $$THEME_DIRS; do \
- echo "mkdir $(pkgdatadir)/$$p"; \
- mkdir $(pkgdatadir)/$$p; \
+ echo "mkdir $(DESTDIR)$(pkgdatadir)/$$p"; \
+ mkdir $(DESTDIR)$(pkgdatadir)/$$p; \
done; \
THEME_FILES=`find $$theme -type f`; \
for p in $$THEME_FILES; do \
xarchon-fonts.patch:
--- NEW FILE xarchon-fonts.patch ---
--- xarchon-0.50/src/board.c.orig 2002-09-26 08:28:46.000000000 -0400
+++ xarchon-0.50/src/board.c 2002-09-26 08:29:02.000000000 -0400
@@ -27,7 +27,7 @@
#define FLOOR_DARK 0 /* steppings for light and dark */
#define FLOOR_LIGHT 7 /* outside luminance cycle */
-#define FONT_NAME "-misc-fixed-medium-*-normal-*-15-0-*-*-*-*-iso8859-1"
+#define FONT_NAME "-misc-fixed-medium-*-normal-*-*-*-*-*-*-*-iso8859-1"
#define V_CELL_YSIZE 40 /* revive cell height */
--- xarchon-0.50/src/field.c.orig 2002-09-26 08:22:45.000000000 -0400
+++ xarchon-0.50/src/field.c 2002-09-26 08:23:11.000000000 -0400
@@ -20,7 +20,7 @@
/* defines */
/*--------------------------------------------------------------------------*/
-#define FONT_NAME "-misc-fixed-medium-*-normal-*-40-0-*-*-*-*-iso8859-1"
+#define FONT_NAME "-misc-fixed-medium-*-normal-*-*-*-*-*-*-*-iso8859-1"
#define NUM_ROCKS 12
#define ROCK_DELAY 2 /* rocks delay time in frames */
--- NEW FILE xarchon.desktop ---
[Desktop Entry]
Name=XArchon
Comment=Arcade board game
Exec=xarchon
Icon=xarchon
Terminal=false
Type=Application
Encoding=UTF-8
Categories=Application;Game;ArcadeGame;BoardGame;
--- NEW FILE xarchon.spec ---
Name: xarchon
Version: 0.50
Release: 2%{?dist}
Summary: Arcade board game
Group: Amusements/Games
License: GPL
URL: http://xarchon.seul.org/
Source0: http://xarchon.seul.org/%{name}-%{version}.tar.gz
Source1: %{name}.desktop
Patch0: %{name}-fonts.patch
Patch1: %{name}-destdir.patch
Patch2: http://ftp.debian.org/debian/pool/main/x/%{name}/%{name}_0.50-9.diff.gz
Patch3: %{name}-0.50-extraqual.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtk+-devel esound-devel libXpm-devel
BuildRequires: desktop-file-utils ImageMagick
%description
XArchon is a chess with a twist board game. It is modelled after the golden
oldie Archon game created by Freefall Associates.
%prep
%setup -q
%patch0 -p1
%patch1 -p0
%patch2 -p1
%patch3 -p0
%build
%configure
make %{?_smp_mflags}
convert data/icon.xpm %{name}.png
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# below is the desktop file and icon stuff.
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
--add-category X-Fedora \
%{SOURCE1}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
install -p -m 644 %{name}.png \
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
%clean
rm -rf $RPM_BUILD_ROOT
%post
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
%postun
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
%{_mandir}/man6/%{name}.6.gz
%changelog
* Sat May 13 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.50-2
- consistent use of %%{name} (everywhere).
- Add BR: libXPM-devel
- Drop NEWS from %%doc as it contains no relevant information.
* Thu May 11 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.50-1
- Pick xarchon up from Ville and submit it for Review as Ville doens't
have the time for this.
* Tue Mar 14 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.50-0.2
- Fix build with gcc >= 3.4 (partially from Debian).
- Install icon to %%{_datadir}/icons/hicolor.
* Sat May 28 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.50-0.1
- Rebuild for FC4.
* Sun Sep 14 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.50-0.fdr.3
- Install data into %%{_datadir}/games/xarchon.
- Remove #---- section markers.
* Sun Jun 1 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.50-0.fdr.2
- Spec cleanups.
* Sat Mar 22 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.50-0.fdr.1
- Update to current Fedora guidelines.
* Fri Feb 7 2003 Ville Skyttä <ville.skytta at iki.fi> - 0.50-1.fedora.1
- First Fedora release.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xarchon/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 15 May 2006 18:48:58 -0000 1.1
+++ .cvsignore 15 May 2006 18:49:42 -0000 1.2
@@ -0,0 +1,2 @@
+xarchon-0.50.tar.gz
+xarchon_0.50-9.diff.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xarchon/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 15 May 2006 18:48:58 -0000 1.1
+++ sources 15 May 2006 18:49:42 -0000 1.2
@@ -0,0 +1,2 @@
+491dea5b4e61ed13cd988d1c184a8ef0 xarchon-0.50.tar.gz
+903d8e4a90d24ac006d654e5a224076a xarchon_0.50-9.diff.gz
More information about the fedora-extras-commits
mailing list