rpms/gweled/devel gweled-Sample_Free.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 gweled-Makefile.patch, 1.1, 1.2 gweled.spec, 1.9, 1.10 sources, 1.4, 1.5 gweled-gcc4.patch, 1.2, NONE
Thorsten Leemhuis (thl)
fedora-extras-commits at redhat.com
Wed Oct 5 17:42:39 UTC 2005
Author: thl
Update of /cvs/extras/rpms/gweled/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3348
Modified Files:
.cvsignore gweled-Makefile.patch gweled.spec sources
Added Files:
gweled-Sample_Free.patch
Removed Files:
gweled-gcc4.patch
Log Message:
update to 0.7
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();
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gweled/devel/.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 5 Oct 2005 17:42:37 -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/devel/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 5 Oct 2005 17:42:37 -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/devel/gweled.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gweled.spec 13 Apr 2005 08:10:02 -0000 1.9
+++ gweled.spec 5 Oct 2005 17:42:37 -0000 1.10
@@ -1,6 +1,6 @@
Name: gweled
-Version: 0.6
-Release: 3
+Version: 0.7
+Release: 1
Summary: Swapping gem game
@@ -9,12 +9,13 @@
URL: http://sebdelestaing.free.fr/gweled/
Source0: http://sebdelestaing.free.fr/gweled/Release/gweled-%{version}.tar.gz
Patch0: %{name}-Makefile.patch
-Patch1: %{name}-gcc4.patch
+Patch1: %{name}-Sample_Free.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
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
@@ -27,7 +28,7 @@
%prep
%setup -q
%patch0 -p0 -b .patch0
-%patch1 -p1 -b .gcc4
+%patch1 -p0 -b .patch0
%build
%configure
@@ -57,13 +58,21 @@
%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING NEWS
-%attr(2551,root,games) %{_bindir}/gweled
-%config(noreplace) %attr(0664,games,games) %{_localstatedir}/lib/games/*
+%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
+* 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
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gweled/devel/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 5 Oct 2005 17:42:37 -0000 1.5
@@ -1 +1 @@
-40b4eaa8e1aca93cf6bc9d91a3c2c048 gweled-0.6.tar.gz
+730fe1737e0b0e9940575aa573d63d84 gweled-0.7.tar.gz
--- gweled-gcc4.patch DELETED ---
More information about the fedora-extras-commits
mailing list