[meego-commits] 14537: Changes to Trunk:Testing/gnome-menus

[Anas Nashif]

Hi,
I have made the following changes to gnome-menus in project Trunk:Testing. Please review and accept ASAP.

Thank You,
Anas Nashif

[This message was auto-generated]

---

Request #14537:

  submit:   devel:gnome/gnome-menus(r2) -> Trunk:Testing/gnome-menus


Message:
    Remove make flags; this avoids a makefile race condition (forwarded request 14535 from pmccarty)

State:   new          2011-03-04T15:38:58 nashif
Comment: None



changes files:
--------------
--- gnome-menus.changes
+++ gnome-menus.changes
@@ -0,0 +1,5 @@
+* Fri Mar 04 2011 Patrick McCarty <patrick.mccarty at linux.intel.com> - 2.30.2
+- Disable make flags for this package, since there is a race condition
+  when building in `desktop-directories'.  This ensures `intltool-merge'
+  correctly merges translations into directory entries.  (BMC#14131)
+

spec files:
-----------
--- gnome-menus.spec
+++ gnome-menus.spec
@@ -1,6 +1,6 @@
 # 
-# Do not Edit! Generated by:
-# spectacle version 0.18
+# Do NOT Edit the Auto-generated Part!
+# Generated by: spectacle version 0.22
 # 
 # >> macros
 # << macros
@@ -62,7 +62,7 @@
 %configure --disable-static \
     --with-monitor-backend=gio
 
-make %{?jobs:-j%jobs}
+make
 
 # >> build post
 # << build post

other changes:
--------------

++++++ gnome-menus.yaml
--- gnome-menus.yaml
+++ gnome-menus.yaml
@@ -27,6 +27,7 @@
     - pkgconfig
     - python2-devel >= 2.3.0
     - intltool
+Builder: single-make
 SubPackages:
     - Name: devel
       Summary: Libraries and include files for the GNOME menu system