rpms/gweled/EL-4 gweled-Sample_Free.patch, NONE, 1.1 gweled-mikmod-disable-disk-writers.diff, NONE, 1.1 gweled-ppc.diff, NONE, 1.1 .cvsignore, 1.4, 1.5 gweled-Makefile.patch, 1.1, 1.2 gweled.spec, 1.4, 1.5 sources, 1.4, 1.5
Thorsten Leemhuis (thl)
fedora-extras-commits at redhat.com
Fri Apr 27 14:38:08 UTC 2007
- Previous message: rpms/monkey-bubble/devel monkey-bubble-0.4.0-help.patch, NONE, 1.1 monkey-bubble.spec, 1.10, 1.11
- Next message: rpms/firmware-addon-dell/devel .cvsignore, 1.9, 1.10 firmware-addon-dell.spec, 1.8, 1.9 sources, 1.9, 1.10
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: thl
Update of /cvs/extras/rpms/gweled/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32478
Modified Files:
.cvsignore gweled-Makefile.patch gweled.spec sources
Added Files:
gweled-Sample_Free.patch
gweled-mikmod-disable-disk-writers.diff gweled-ppc.diff
Log Message:
sync with EL-5
gweled-Sample_Free.patch:
--- NEW FILE gweled-Sample_Free.patch ---
diff -Naur src.org/main.c src/main.c
--- src.org/main.c 2005-10-05 19:04:11.000000000 +0200
+++ src/main.c 2005-10-05 19:04:28.000000000 +0200
@@ -365,7 +365,7 @@
if(swap_sfx)
Sample_Free(swap_sfx);
if(click_sfx)
- Sample_Free(swap_sfx);
+ Sample_Free(click_sfx);
MikMod_Exit();
gweled-mikmod-disable-disk-writers.diff:
--- NEW FILE gweled-mikmod-disable-disk-writers.diff ---
diff -urN gweled-0.7~/src/main.c gweled-0.7/src/main.c
--- gweled-0.7~/src/main.c 2005-05-25 23:44:04.000000000 +0200
+++ gweled-0.7/src/main.c 2006-12-05 18:29:49.000000000 +0100
@@ -254,7 +254,11 @@
PACKAGE_DATA_DIR, NULL);
/* register all the drivers */
- MikMod_RegisterAllDrivers();
+ MikMod_RegisterDriver(&drv_AF);
+ MikMod_RegisterDriver(&drv_esd);
+ MikMod_RegisterDriver(&drv_alsa);
+ MikMod_RegisterDriver(&drv_oss);
+ MikMod_RegisterDriver(&drv_nos);
/* register all the module loaders */
MikMod_RegisterAllLoaders();
gweled-ppc.diff:
--- NEW FILE gweled-ppc.diff ---
--- src/board_engine.c.orig 2004-11-09 22:53:38.000000000 +0100
+++ src/board_engine.c 2004-11-09 23:12:28.116177720 +0100
@@ -40,7 +40,7 @@
gint gi_x_click = 0;
gint gi_y_click = 0;
-gchar gpc_game_board[BOARD_WIDTH][BOARD_HEIGHT];
+gint gpc_game_board[BOARD_WIDTH][BOARD_HEIGHT];
gint gi_nb_of_tiles[7];
gboolean g_do_not_score;
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gweled/EL-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 5 Dec 2004 14:44:31 -0000 1.4
+++ .cvsignore 27 Apr 2007 14:37:33 -0000 1.5
@@ -1 +1 @@
-gweled-0.6.tar.gz
+gweled-0.7.tar.gz
gweled-Makefile.patch:
Index: gweled-Makefile.patch
===================================================================
RCS file: /cvs/extras/rpms/gweled/EL-4/gweled-Makefile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gweled-Makefile.patch 5 Dec 2004 14:44:31 -0000 1.1
+++ gweled-Makefile.patch 27 Apr 2007 14:37:33 -0000 1.2
@@ -1,24 +1,14 @@
---- Makefile.in.patch0 2004-11-30 21:26:41.000000000 +0100
-+++ Makefile.in 2004-12-01 18:54:34.522949336 +0100
-@@ -624,14 +624,14 @@
- fi \
- done \
+--- Makefile.in.old 2005-10-04 17:32:23.000000000 +0200
++++ Makefile.in 2005-10-04 17:32:35.000000000 +0200
+@@ -644,9 +644,9 @@
fi
-- -$(mkinstalldirs) $(scoredir)
-- touch $(scoredir)/gweled.easy.scores
-- -chown $(scores_user):$(scores_group) $(scoredir)/gweled.easy.scores
-- -chmod 664 $(scoredir)/gweled.easy.scores
-- touch $(scoredir)/gweled.timed.scores
-- -chown $(scores_user):$(scores_group) $(scoredir)/gweled.timed.scores
-- -chmod 664 $(scoredir)/gweled.timed.scores
+ -$(mkinstalldirs) $(DESTDIR)$(scoredir)
+ touch $(DESTDIR)$(scoredir)/gweled.easy.scores
+- -chown $(scores_user):$(scores_group) $(DESTDIR)$(scoredir)/gweled.easy.scores
+- -chmod 664 $(DESTDIR)$(scoredir)/gweled.easy.scores
- -if test "x$(setgid)" = "xtrue"; then chgrp $(scores_group) $(DESTDIR)$(bindir)/gweled && chmod 2555 $(DESTDIR)$(bindir)/gweled ; fi
-+ -$(mkinstalldirs) $(DESTDIR)$(scoredir)
-+ touch $(DESTDIR)$(scoredir)/gweled.easy.scores
+# -chown $(scores_user):$(scores_group) $(DESTDIR)$(scoredir)/gweled.easy.scores
+# -chmod 664 $(DESTDIR)$(scoredir)/gweled.easy.scores
-+ touch $(DESTDIR)$(scoredir)/gweled.timed.scores
-+# -chown $(scores_user):$(scores_group) $(DESTDIR)$(scoredir)/gweled.timed.scores
-+# -chmod 664 $(DESTDIR)$(scoredir)/gweled.timed.scores
+# -if test "x$(setgid)" = "xtrue"; then chgrp $(scores_group) $(DESTDIR)$(bindir)/gweled && chmod 2555 $(DESTDIR)$(bindir)/gweled ; fi
dist-hook:
Index: gweled.spec
===================================================================
RCS file: /cvs/extras/rpms/gweled/EL-4/gweled.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gweled.spec 5 Dec 2004 14:44:31 -0000 1.4
+++ gweled.spec 27 Apr 2007 14:37:33 -0000 1.5
@@ -1,20 +1,24 @@
Name: gweled
-Version: 0.6
-Release: 1
-Epoch: 0
-Summary: Swapping gem game.
+Version: 0.7
+Release: 8%{?dist}
+
+Summary: Swapping gem game
Group: Amusements/Games
License: GPL
URL: http://sebdelestaing.free.fr/gweled/
Source0: http://sebdelestaing.free.fr/gweled/Release/gweled-%{version}.tar.gz
-Patch0: %{name}-Makefile.patch
+Patch0: %{name}-Makefile.patch
+Patch1: %{name}-Sample_Free.patch
+Patch2: %{name}-ppc.diff
+Patch3: %{name}-mikmod-disable-disk-writers.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: libgnomeui-devel >= 0:2.0.0
-BuildRequires: librsvg2-devel >= 0:2.0.0
-BuildRequires: libcroco-devel >= 0:0.3.0
-BuildRequires: desktop-file-utils
+BuildRequires: libgnomeui-devel >= 2.0.0
+BuildRequires: librsvg2-devel >= 2.0.0
+BuildRequires: libcroco-devel >= 0.3.0
+BuildRequires: mikmod-devel
+BuildRequires: desktop-file-utils
%description
Gweled is a Gnome version of a popular PalmOS/Windows/Java game called
@@ -25,9 +29,16 @@
%prep
%setup -q
-%patch0 -p0 -b .patch0
+%patch0 -p0 -b .patch0
+%patch1 -p0 -b .patch1
+# the next two were extracted from the debian package; I asked upstream to
+# apply them, but got no reply
+# http://ftp.debian.org/debian/pool/main/g/gweled/gweled_0.7-2.diff.gz
+%patch2 -p0 -b .patch2
+%patch3 -p1 -b .patch3
%build
+export LDFLAGS="${LDFLAGS} -Wl,--export-dynamic"
%configure
echo "Encoding=UTF-8" >> gweled.desktop
mv gweled.desktop gweled.desktop.old
@@ -39,12 +50,14 @@
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
-desktop-file-install --vendor fedora --delete-original \
- --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
- --add-category X-Fedora \
+desktop-file-install --vendor fedora --delete-original \
+ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
+ --add-category X-Fedora \
${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
mkdir $RPM_BUILD_ROOT%{_localstatedir}/lib/
-mv $RPM_BUILD_ROOT%{_localstatedir}/games/ $RPM_BUILD_ROOT%{_localstatedir}/lib/games/
+mv $RPM_BUILD_ROOT%{_localstatedir}/games/ $RPM_BUILD_ROOT%{_localstatedir}/lib/
+# gweled.timed.scores not shipped in 0.7, but needed
+cp -p $RPM_BUILD_ROOT%{_localstatedir}/lib/games/gweled.easy.scores $RPM_BUILD_ROOT%{_localstatedir}/lib/games/gweled.timed.scores
%clean
@@ -54,14 +67,53 @@
%files
%defattr(-,root,root,-)
-%doc AUTHORS COPYING NEWS README
-%attr(2551,root,games) %{_bindir}/gweled
-%config(noreplace) %attr(0664,games,games) %{_localstatedir}/lib/games/*
+%doc AUTHORS COPYING NEWS
+%attr(2551,root,games) %{_bindir}/%{name}
+%attr(0664,games,games) %{_localstatedir}/lib/games/*
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/pixmaps/*
-%{_datadir}/gweled/
+%{_datadir}/%{name}/
+%{_datadir}/sounds/%{name}/
%changelog
+* Sat Mar 17 2007 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 0.7-8
+- create gweled.timed.scores manually, fixes 232184
+
+* Sat Feb 24 2007 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 0.7-7
+- Add gweled-ppc.diff and gweled-mikmod-disable-disk-writers.diff from
+ debian package; the later fixes #227984
+
+* Tue Aug 29 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 0.7-6
+- Rebuild for devel
+
+* Sun Mar 26 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 0.7-5
+- Add LDFLAGS="-Wl,--export-dynamic" (thx to Kevin Kofler for the hint)
+
+* Mon Feb 13 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 0.7-4
+- Rebuild for Fedora Extras 5
+
+* Sun Jan 29 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 0.7-3
+- Fix build in devel (mv behaviour changed)
+
+* Tue Oct 05 2005 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 0.7-2
+- Use dist
+
+* Tue Oct 04 2005 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 0.7-1
+- Update to 0.7
+- drop gcc4 patch (upstream now)
+- Update Makefile-patch
+- add Sample_Free.patch to avoid double free on exit (with help from adrianr)
+- score file must not be conffile
+
+* Wed Apr 13 2005 Adrian Reber <adrian at lisas.de> - 0.6-3
+- fixed gcc4 errors
+- removed empty README file
+- fixed segfault caused by:
+ call to __builtin___memset_chk will always overflow destination buffer
+
+* Fri Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+- rebuilt
+
* Tue Aug 31 2004 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 0:0.6-1
- Update to 0.6
- Remove highscore workaround
@@ -74,7 +126,7 @@
* Thu Jan 15 2004 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 0:0.4-0.fdr.2
- Own dirs correctly
-- BuildRequires desktop-file-utils
+- BuildRequires desktop-file-utils
* Fri Jan 09 2004 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 0:0.4-0.fdr.1
- Update to 0.4
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gweled/EL-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 5 Dec 2004 14:44:31 -0000 1.4
+++ sources 27 Apr 2007 14:37:33 -0000 1.5
@@ -1 +1 @@
-40b4eaa8e1aca93cf6bc9d91a3c2c048 gweled-0.6.tar.gz
+730fe1737e0b0e9940575aa573d63d84 gweled-0.7.tar.gz
- Previous message: rpms/monkey-bubble/devel monkey-bubble-0.4.0-help.patch, NONE, 1.1 monkey-bubble.spec, 1.10, 1.11
- Next message: rpms/firmware-addon-dell/devel .cvsignore, 1.9, 1.10 firmware-addon-dell.spec, 1.8, 1.9 sources, 1.9, 1.10
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list