rpms/fbg/devel .cvsignore, 1.2, 1.3 fbg-fixes.patch, 1.1, 1.2 fbg.spec, 1.3, 1.4 sources, 1.2, 1.3

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/fbg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30087

Modified Files:
	.cvsignore fbg-fixes.patch fbg.spec sources 
Log Message:
* Tue Aug 21 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9.1-1
- New upstream release 0.9.1, license changed from GPLv2 to GPLv2+,
  no other changes



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fbg/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Oct 2006 11:39:38 -0000	1.2
+++ .cvsignore	21 Aug 2007 21:24:42 -0000	1.3
@@ -1 +1 @@
-fbg-0.9.tar.gz
+fbg-0.9.1.tar.gz

fbg-fixes.patch:

Index: fbg-fixes.patch
===================================================================
RCS file: /cvs/extras/rpms/fbg/devel/fbg-fixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fbg-fixes.patch	14 Oct 2006 11:39:38 -0000	1.1
+++ fbg-fixes.patch	21 Aug 2007 21:24:42 -0000	1.2
@@ -1,25 +1,5 @@
-diff -ur fbg-0.9/configure fbg-0.9.new/configure
---- fbg-0.9/configure	2002-12-27 05:42:50.000000000 +0100
-+++ fbg-0.9.new/configure	2006-10-11 21:51:32.000000000 +0200
-@@ -6761,13 +6761,13 @@
- test "$prefix" = "NONE" && prefix=/usr/local
- test "$exec_prefix" = "NONE" && exec_prefix=$prefix
- 
--eval FBGDATADIR="$prefix/games/$PACKAGE"
-+eval FBGDATADIR="$prefix/share/$PACKAGE"
- cat >>confdefs.h <<_ACEOF
- #define FBGDATADIR "$FBGDATADIR"
- _ACEOF
- 
- 
--datadir="\$(prefix)/games"
-+datadir="\$(prefix)/share"
- 
- 
-           ac_config_files="$ac_config_files Makefile"
-diff -ur fbg-0.9/configure.in fbg-0.9.new/configure.in
---- fbg-0.9/configure.in	2002-12-27 05:42:44.000000000 +0100
-+++ fbg-0.9.new/configure.in	2006-10-11 21:51:32.000000000 +0200
+--- fbg-0.9/configure.in.ag	2002-12-27 05:42:44.000000000 +0100
++++ fbg-0.9.new/configure.in.ag	2006-10-11 21:51:32.000000000 +0200
 @@ -125,11 +125,11 @@
  test "$prefix" = "NONE" && prefix=/usr/local
  test "$exec_prefix" = "NONE" && exec_prefix=$prefix


Index: fbg.spec
===================================================================
RCS file: /cvs/extras/rpms/fbg/devel/fbg.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fbg.spec	6 Aug 2007 12:09:56 -0000	1.3
+++ fbg.spec	21 Aug 2007 21:24:42 -0000	1.4
@@ -1,16 +1,23 @@
 Name:           fbg
-Version:        0.9
-Release:        4%{?dist}
+Version:        0.9.1
+Release:        1%{?dist}
 Summary:        Falling Block Game
 Group:          Amusements/Games
-License:        GPLv2
+License:        GPLv2+
 URL:            http://fbg.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+# Upstream has done a new release at our request (changing the license from
+# GPLv2 to GPLv2+) but has not gotten around to providing a tarbal, thus we use
+# one generated from cvs like this:
+# cvs -z3 -d:pserver:anonymous at fbg.cvs.sourceforge.net:/cvsroot/fbg co -P -r rel-0-9-1 fbg
+# rm -r `find fbg -name CVS`
+# mv fbg fbg-0.9.1
+# tar cvfz fbg-0.9.1.tar.gz fbg-0.9.1
+Source0:        %{name}-%{version}.tar.gz
 Source1:        %{name}.desktop
 Patch0:         fbg-fixes.patch
 Patch1:         fbg-0.9-wx28.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  SDL-devel physfs-devel mikmod-devel wxGTK-devel
+BuildRequires:  SDL-devel physfs-devel mikmod-devel wxGTK-devel libtool
 BuildRequires:  desktop-file-utils ImageMagick
 Requires:       hicolor-icon-theme
 
@@ -24,10 +31,7 @@
 %setup -q
 %patch0 -p1 -z .fix
 %patch1 -p1 -z .wx28
-# sigh stop autoxxx from rerunning because of our patches above.
-touch aclocal.m4
-touch configure
-touch `find -name Makefile.in`
+./autogen.sh
 
 
 %build
@@ -80,6 +84,10 @@
 
 
 %changelog
+* Tue Aug 21 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9.1-1
+- New upstream release 0.9.1, license changed from GPLv2 to GPLv2+,
+  no other changes
+
 * Mon Aug  6 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.9-4
 - Update License tag for new Licensing Guidelines compliance
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fbg/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Oct 2006 11:39:38 -0000	1.2
+++ sources	21 Aug 2007 21:24:42 -0000	1.3
@@ -1 +1 @@
-82db64d84b6172f5676fcff69d533881  fbg-0.9.tar.gz
+2a6543b68c0bf3b4a018fe7f6fb155c5  fbg-0.9.1.tar.gz