[openerp7] Updating to today's nightly build, adding R: unittest2.

leamas leamas at fedoraproject.org
Thu Jan 9 15:27:05 UTC 2014


commit d6717a8b1c5fe0e49319c84da14344759e5892ce
Author: Alec Leamas <alec at tests.notat.diaspora.com>
Date:   Thu Jan 9 16:20:09 2014 +0100

    Updating to today's nightly build, adding R: unittest2.

 .gitignore                   |    1 +
 openerp-unbundle-fonts.patch |   18 +++++++++++++++---
 openerp7.spec                |    8 ++++++--
 sources                      |    2 +-
 4 files changed, 23 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 088e1a0..8fb3962 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /openerp-7.0-20130618-231044.tar.gz
+/openerp-7.0-20140109-002644.tar.gz
diff --git a/openerp-unbundle-fonts.patch b/openerp-unbundle-fonts.patch
index adf1f59..5674007 100644
--- a/openerp-unbundle-fonts.patch
+++ b/openerp-unbundle-fonts.patch
@@ -1,16 +1,25 @@
+From ed315dc300985d637865fd37c4458dfc706e0f0b Mon Sep 17 00:00:00 2001
+From: Alec Leamas <alec at tests.notat.diaspora.com>
+Date: Thu, 9 Jan 2014 16:05:46 +0100
+Subject: [PATCH] unbundle fonts
+
+---
+ openerp/addons/web/static/src/css/base.css | 11 ++---------
+ 1 file changed, 2 insertions(+), 9 deletions(-)
+
 diff --git a/openerp/addons/web/static/src/css/base.css b/openerp/addons/web/static/src/css/base.css
-index 4b7df6b..819a222 100644
+index fabb850..50b88f8 100644
 --- a/openerp/addons/web/static/src/css/base.css
 +++ b/openerp/addons/web/static/src/css/base.css
 @@ -1,21 +1,14 @@
- @charset "UTF-8";
+ @charset "utf-8";
  @font-face {
    font-family: "mnmliconsRegular";
 -  src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot");
 -  src: url("/web/static/src/font/mnmliconsv21-webfont.woff") format("woff");
 -  src: url("/web/static/src/font/mnmliconsv21-webfont.ttf") format("truetype");
 -  src: url("/web/static/src/font/mnmliconsv21-webfont.svg") format("svg") active;
-+  src: url("/usr/share/fonts/nmnlicons/mnmliconsv.ttf") format("truetype");
++  src: url("/usr/share/fonts/nmnlicons/mnmliconsv.ttf") format("truetype")
    font-weight: normal;
    font-style: normal;
  }
@@ -26,3 +35,6 @@ index 4b7df6b..819a222 100644
    font-weight: normal;
    font-style: normal;
  }
+-- 
+1.8.3.1
+
diff --git a/openerp7.spec b/openerp7.spec
index 22b4917..44de4fe 100644
--- a/openerp7.spec
+++ b/openerp7.spec
@@ -1,10 +1,10 @@
-%global     oe_rel 20130618-231044
+%global     oe_rel 20140109-002644
             # Tarball's source directory.
 %global     oe_src_dir openerp-%{version}-%{oe_rel}
 
 Name:       openerp7
 Version:    7.0
-Release:    2.%(echo %{oe_rel} | tr '-' '_')%{?dist}
+Release:    3.%(echo %{oe_rel} | tr '-' '_')%{?dist}
 Summary:    Business Applications Server
             # See LICENSING-BREAKDOWN
 License:    AGPLv3 and GPLv3 and BSD and Beerware
@@ -70,6 +70,7 @@ Requires:   python-ZSI
 Requires:   pytz
 Requires:   pywebdav
 Requires:   PyYAML
+Requires:   unittest2
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  libxslt-python
@@ -229,6 +230,9 @@ usermod -d /var/run/openerp openerp >/dev/null 2>&1 || :
 
 
 %changelog
+* Thu Jan 09 2014 leamas.alec at gmail.com - 7.0-3.20140109_002644
+- Updating to today's nightly build, adding R: unittest2.
+
 * Thu Oct 3 2013 Alec Leamas <leamas at nowhere.com>  7.0-2.20130618_231044
 - Add missing Requires:
 
diff --git a/sources b/sources
index 2968993..ccec841 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b035713a3e8f27767fb44b38a39fee1a  openerp-7.0-20130618-231044.tar.gz
+76941305a7c1094d855854e47c66079a  openerp-7.0-20140109-002644.tar.gz


More information about the scm-commits mailing list