rpms/gmameui/devel gmameui-fix3.patch, NONE, 1.1 gmameui-fix4.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 gmameui.spec, 1.6, 1.7 sources, 1.4, 1.5 gmameui-0.2.12-fix2.patch, 1.1, NONE

Thu Jul 5 21:05:45 CEST 2012

Author: sergiomb

Update of /cvs/nonfree/rpms/gmameui/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv17544

Modified Files:
	.cvsignore gmameui.spec sources 
Added Files:
	gmameui-fix3.patch gmameui-fix4.patch 
Removed Files:
	gmameui-0.2.12-fix2.patch 
Log Message:
* Wed Jul 04 2012 SÃ©rgio Basto <sergio at serjux.com> - 0.2.13-0.1.20120704cvs
- from Julian Sikorski patch for gmameui.spec : 
  - Updated the license tag to GPLv3+
  - Added vte-devel to BuildRequires, removed explicit gtk2-devel
  - Dropped empty README and TODO from %doc
- add gmameui-fix3.patch, fix3 extends old fix2, which Fix FTBFS with
  libarchive12 
- add gmameui-fix4.patch, which force autotools use autopoint, which make autogen.sh works much more
  smooth. TODO understand why ./setup-gettext --gettext-tool, don't return autopoint in mock build.


gmameui-fix3.patch:
 gmameui-zip-utils.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE gmameui-fix3.patch ---
* Fix FTBFS with libarchive12
* Build-depend on libarchive-dev (>= 3.0.0)
--- src/gmameui-zip-utils.c.orig	2012-07-02 05:51:55.114101799 +0100
+++ src/gmameui-zip-utils.c	2012-07-02 05:53:00.638847033 +0100
@@ -96,7 +96,7 @@ read_pixbuf_from_zip_file (gchar *zipfil
 			buffer_data = (gchar *) g_malloc0 (filesize);
 			
 			/* Read the zipped pixbuf into memory */
-			archive_read_data_into_buffer (zipfile, buffer_data, filesize);
+			archive_read_data (zipfile, buffer_data, filesize);
 			
 			pixbuf = load_pixbuf_data (buffer_data, filesize);
 									 
@@ -266,7 +266,7 @@ GList *get_zip_contents_OLD (gchar *zipf
 		buffer_data = (guchar *) g_malloc0 (filesize);
 
 		/* Read the zipped ROM into memory */
-		i = archive_read_data_into_buffer (zipfile, buffer_data, filesize);
+		i = archive_read_data (zipfile, buffer_data, filesize);
 
 		if ((i == ARCHIVE_FATAL) || (i == ARCHIVE_WARN)) {
 			GMAMEUI_DEBUG ("Error/warning from zip file %s - %s", filename, archive_error_string (zipfile));

gmameui-fix4.patch:
 setup-gettext |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gmameui-fix4.patch ---
--- setup-gettext.orig	2012-07-02 06:24:01.754301270 +0100
+++ setup-gettext	2012-07-02 06:28:56.355849439 +0100
@@ -181,7 +181,7 @@ if test $NUMVAR -gt 0; then
 fi
 
 # Okay, run the main stuff
-if test "$GETTEXT_TOOL" = "autopoint"; then
+if [ 1 == 1 ]; then
 	backup_m4
 	[ $VERBOSE -eq 1 ] && echo "  autopoint --force"
 	echo n | autopoint --force || abort


Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/gmameui/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	13 May 2012 21:44:15 -0000	1.4
+++ .cvsignore	5 Jul 2012 19:05:44 -0000	1.5
@@ -1 +1 @@
-gmameui-0.2.12.tar.gz
+gmameui-gmameui20120704cvs.tar.gz


Index: gmameui.spec
===================================================================
RCS file: /cvs/nonfree/rpms/gmameui/devel/gmameui.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gmameui.spec	13 May 2012 22:32:24 -0000	1.6
+++ gmameui.spec	5 Jul 2012 19:05:45 -0000	1.7
@@ -1,15 +1,16 @@
 Summary: Frontend for MAME
 Name: gmameui
-Version: 0.2.12
-Release: 1%{?dist}
-License: GPLv2+
+Version: 0.2.13
+Release: 0.1.20120704cvs%{?dist}
+License: GPLv3+
 Group: Applications/Emulators
 URL: http://gmameui.sourceforge.net/
-Source0: http://downloads.sf.net/gmameui/gmameui-%{version}.tar.gz
+#http://gmameui.cvs.sourceforge.net/viewvc/gmameui/gmameui/?view=tar
+Source0: gmameui-gmameui20120704cvs.tar.gz
 Patch0: gmameui-0.2.12-fix.patch
-Patch1: gmameui-0.2.12-fix2.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: gtk2-devel
+Patch2: gmameui-fix3.patch
+Patch3: gmameui-fix4.patch
+#BuildRequires: gtk2-devel
 BuildRequires: libgnome-devel
 BuildRequires: expat-devel
 BuildRequires: libglade2-devel
@@ -19,6 +20,10 @@
 BuildRequires: libvtemm-devel
 BuildRequires: gnome-doc-utils
 BuildRequires: rarian-compat
+BuildRequires: libzip-devel
+BuildRequires: gtkimageview-devel
+BuildRequires: vte-devel
+
 
 %description
 GMAMEUI is a front-end program that helps you run MAME (either xmame or
@@ -26,12 +31,14 @@
 
 
 %prep
-%setup -q
+%setup -q -n gmameui
 %patch0 -p1 -b .fix
-%patch1 -p1 -b .fix2
+%patch2 -p0 -b .fix3
+%patch3 -p0 -b .fix4
 
 
 %build
+./autogen.sh
 %configure
 %{__make} %{?_smp_mflags}
 
@@ -43,13 +50,10 @@
 
 # Put the docs back into place
 %{__mkdir} _docs
+%{__rm} -f %{buildroot}%{_docdir}/%{name}*/{README,TODO}
 %{__mv} %{buildroot}%{_docdir}/%{name}*/* _docs/
 
 
-%clean
-%{__rm} -rf %{buildroot}
-
-
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc _docs/*
@@ -63,6 +67,16 @@
 
 
 %changelog
+* Wed Jul 04 2012 SÃ©rgio Basto <sergio at serjux.com> - 0.2.13-0.1.20120704cvs
+- from Julian Sikorski patch for gmameui.spec : 
+  - Updated the license tag to GPLv3+
+  - Added vte-devel to BuildRequires, removed explicit gtk2-devel
+  - Dropped empty README and TODO from %%doc
+- add gmameui-fix3.patch, fix3 extends old fix2, which Fix FTBFS with
+  libarchive12 
+- add gmameui-fix4.patch, which force autotools use autopoint, which make autogen.sh works much more
+  smooth. TODO understand why ./setup-gettext --gettext-tool, don't return autopoint in mock build.
+
 * Sun May 13 2012 Nicolas Chauvet <kwizart at gmail.com> - 0.2.12-1
 - Update to 0.2.12
 - Fix build


Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/gmameui/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	13 May 2012 21:44:15 -0000	1.4
+++ sources	5 Jul 2012 19:05:45 -0000	1.5
@@ -1 +1 @@
-e1f36731b0007501cf4c169aaee2ccc8  gmameui-0.2.12.tar.gz
+10ecddacd3239b395f84bd034bc5531e  gmameui-gmameui20120704cvs.tar.gz


--- gmameui-0.2.12-fix2.patch DELETED ---
