rpms/bubbros/devel .cvsignore, 1.2, 1.3 bubbros-1.5-fixes.patch, 1.2, 1.3 bubbros.spec, 1.9, 1.10 sources, 1.2, 1.3

[Hans de Goede]

Author: jwrdegoede

Update of /cvs/free/rpms/bubbros/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv23500

Modified Files:
	.cvsignore bubbros-1.5-fixes.patch bubbros.spec sources 
Log Message:
* Sun Oct 13 2013 Hans de Goede <j.w.r.degoede at gmail.com> - 1.6.2-1
- New upstream release 1.6.2



Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/bubbros/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	24 Jul 2008 11:29:04 -0000	1.2
+++ .cvsignore	13 Oct 2013 15:15:43 -0000	1.3
@@ -1 +1 @@
-bubbros-1.6.tar.bz2
+bubbros-1.6.2.tar.gz

bubbros-1.5-fixes.patch:
 BubBob.py             |   17 ++++++-----------
 bubbob/bb.py          |    4 ++++
 bubbob/bonuses.py     |    4 ++++
 common/stdlog.py      |    3 ++-
 display/dpy_pygame.py |    4 ++--
 display/modes.py      |   22 +++++++++++-----------
 display/pclient.py    |    4 ++--
 doc/BubBob.py.1       |   20 +++++++++-----------
 doc/Client.py.1       |   44 +++++++++++++-------------------------------
 doc/bb.py.1           |   24 ++++++++----------------
 http2/httppages.py    |    3 ++-
 java/Makefile         |    2 +-
 12 files changed, 64 insertions(+), 87 deletions(-)

Index: bubbros-1.5-fixes.patch
===================================================================
RCS file: /cvs/free/rpms/bubbros/devel/bubbros-1.5-fixes.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bubbros-1.5-fixes.patch	24 Jul 2008 11:38:42 -0000	1.2
+++ bubbros-1.5-fixes.patch	13 Oct 2013 15:15:43 -0000	1.3
@@ -60,32 +60,6 @@
      import statesaver
  except ImportError:
      print "'statesaver' module not compiled, no clock bonus"
-diff -up bubbros-1.6/bubbob/statesaver.c.foo bubbros-1.6/bubbob/statesaver.c
---- bubbros-1.6/bubbob/statesaver.c.foo	2007-09-08 17:03:41.000000000 +0200
-+++ bubbros-1.6/bubbob/statesaver.c	2008-07-24 13:44:29.000000000 +0200
-@@ -75,10 +75,6 @@ static PyObject* genbuild(PyObject* g)
-     Py_INCREF(g);  /* exhausted -- can return 'g' itself */
-     return g;
-   }
--  if (f->f_nfreevars || f->f_ncells) {
--    PyErr_SetString(PyExc_ValueError, "generator has cell or free vars");
--    goto error;
--  }
- 
-   if (co->co_argcount == 0)
-     dummy = NULL;
-@@ -143,11 +139,6 @@ static int gencopy(PyObject* g2, PyObjec
-       }
-       f2 = (PyFrameObject*) x;
- 
--      if (f2->f_stacksize != f->f_stacksize) {
--        PyErr_SetString(PyExc_TypeError, "stack size mismatch");
--        goto error;
--      }
--
-       if (f2->f_stacktop != NULL)
-         while (f2->f_stacktop != f2->f_localsplus)
-           {
 diff -up bubbros-1.6/common/stdlog.py.foo bubbros-1.6/common/stdlog.py
 --- bubbros-1.6/common/stdlog.py.foo	2007-09-08 17:03:41.000000000 +0200
 +++ bubbros-1.6/common/stdlog.py	2008-07-24 13:44:29.000000000 +0200


Index: bubbros.spec
===================================================================
RCS file: /cvs/free/rpms/bubbros/devel/bubbros.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- bubbros.spec	3 Mar 2013 21:35:30 -0000	1.9
+++ bubbros.spec	13 Oct 2013 15:15:43 -0000	1.10
@@ -1,16 +1,15 @@
 Name:           bubbros
-Version:        1.6
-Release:        8%{?dist}
+Version:        1.6.2
+Release:        1%{?dist}
 Summary:        Bub and Brothers game inspired by the classic Bubble and Bobble
 Group:          Amusements/Games
 License:        MIT and Artistic Licenses
 URL:            http://bub-n-bros.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/bub-n-bros/%{name}-%{version}.tar.bz2
+Source0:        http://downloads.sourceforge.net/bub-n-bros/%{name}-%{version}.tar.gz
 Source1:        bubbros.desktop
 Patch0:         bubbros-1.5-fixes.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  python-devel ImageMagick desktop-file-utils libX11-devel
-BuildRequires:  libXext-devel xorg-x11-proto-devel java-1.4.2-gcj-compat-devel
+BuildRequires:  libXext-devel xorg-x11-proto-devel java-devel
 Requires:       pygame pygtk2 hicolor-icon-theme
 
 %description
@@ -52,7 +51,6 @@
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}
@@ -85,7 +83,10 @@
 install -m 644 doc/Client.py.1 $RPM_BUILD_ROOT%{_mandir}/man6/bubbros-client.6
 # below is the desktop file and icon stuff.
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-install --vendor dribble           \
+desktop-file-install \
+%if 0%{?fedora} && 0%{?fedora} < 19
+  --vendor dribble \
+%endif
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   %{SOURCE1}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
@@ -93,35 +94,33 @@
   $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
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
 
 %files
-%defattr(-,root,root,-)
 %doc LICENSE.txt artistic.txt levels.txt
 %{_bindir}/bubbros*
 %{_libdir}/%{name}
 %{_datadir}/%{name}
-%{_datadir}/applications/dribble-%{name}.desktop
+%{_datadir}/applications/*%{name}.desktop
 %{_datadir}/icons/hicolor/32x32/apps/%{name}.png
 %{_mandir}/man6/bubbros*.6.gz
 
 
 %changelog
+* Sun Oct 13 2013 Hans de Goede <j.w.r.degoede at gmail.com> - 1.6.2-1
+- New upstream release 1.6.2
+
 * Sun Mar 03 2013 Nicolas Chauvet <kwizart at gmail.com> - 1.6-8
 - Mass rebuilt for Fedora 19 Features
 


Index: sources
===================================================================
RCS file: /cvs/free/rpms/bubbros/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 Jul 2008 11:29:04 -0000	1.2
+++ sources	13 Oct 2013 15:15:43 -0000	1.3
@@ -1 +1 @@
-00aa5e26f5f0ed4c10765e4b33b28a09  bubbros-1.6.tar.bz2
+2249e5c71033029016037f6b3d695326  bubbros-1.6.2.tar.gz