From 9481a96a86544b76505cc5055f9b24a17f75f5ee Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Jul 11 2010 14:52:07 +0000 Subject: - initial build for EL-6 --- diff --git a/.cvsignore b/.cvsignore index b0019cf..abafa6e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -hulahop-0.6.0.tar.bz2 +hulahop-0.7.1.tar.bz2 diff --git a/hulahop-xulrunner-python.patch b/hulahop-xulrunner-python.patch new file mode 100644 index 0000000..ef5d371 --- /dev/null +++ b/hulahop-xulrunner-python.patch @@ -0,0 +1,26 @@ +diff -ur a/src/hulahop.cpp b/src/hulahop.cpp +--- a/src/hulahop.cpp 2009-09-13 23:50:25.000000000 +0200 ++++ b/src/hulahop.cpp 2010-02-18 17:47:04.000000000 +0100 +@@ -25,7 +25,7 @@ + #include + #include + #include +-#include ++#include + + #include "HulahopDirectoryProvider.h" + #include "hulahop.h" +Nur in b/src: hulahop.cpp~. +diff -ur a/src/hulahop-web-view.cpp b/src/hulahop-web-view.cpp +--- a/src/hulahop-web-view.cpp 2009-05-20 13:53:01.000000000 +0200 ++++ b/src/hulahop-web-view.cpp 2010-02-18 17:46:57.000000000 +0100 +@@ -32,7 +32,7 @@ + #include + #include + #include +-#include ++#include + + #include + #include +Nur in b/src: hulahop-web-view.cpp~. diff --git a/hulahop.spec b/hulahop.spec index 1964200..84c1f0c 100644 --- a/hulahop.spec +++ b/hulahop.spec @@ -1,7 +1,7 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: hulahop -Version: 0.6.0 +Version: 0.7.1 Release: 2%{?dist} Summary: A pygtk widget for embedding mozilla @@ -9,9 +9,10 @@ Group: System Environment/Libraries License: LGPL URL: http://www.sugarlabs.org Source0: http://download.sugarlabs.org/sources/sucrose/glucose/hulahop/%{name}-%{version}.tar.bz2 +Patch0: hulahop-xulrunner-python.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: xulrunner-devel-unstable +BuildRequires: xulrunner-devel BuildRequires: xulrunner-python-devel BuildRequires: glib2-devel BuildRequires: gtk2-devel @@ -29,6 +30,7 @@ xpcom API through python. %prep %setup -q +%patch0 -p1 cat >> data/prefs.js << EOF pref("general.useragent.vendor", "OLPC"); @@ -56,6 +58,15 @@ rm -rf $RPM_BUILD_ROOT %{python_sitearch}/* %changelog +* Thu Feb 18 2010 Sebastian Dziallas - 0.7.1-2 +- Changes for new xulrunner-python package + +* Tue Dec 01 2009 Sebastian Dziallas - 0.7.1-1 +- New upstream release + +* Sun Nov 29 2009 Bernie Innocenti - 0.6.0-3 +- Rebuild against latest xulrunner + * Sun Sep 27 2009 Peter Robinson - 0.6.0-2 - Fix source url diff --git a/sources b/sources index 2c6754c..45accb3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -72104085814008bbe914a248594f0b49 hulahop-0.6.0.tar.bz2 +e616e18c86dc3286a00550fa09e687eb hulahop-0.7.1.tar.bz2