merge from gnome-2-30
authorlaca
Wed, 27 Jul 2011 07:07:26 +0000
changeset 22033 b70fc8f8e98a
parent 22032 49aca9061101
child 22036 e299dfe18ac0
merge from gnome-2-30
ChangeLog
base-specs/opal.spec
specs/SUNWncurses.spec
specs/SUNWzz-gnome-l10n.spec
--- a/ChangeLog	Wed Jul 27 07:04:50 2011 +0000
+++ b/ChangeLog	Wed Jul 27 07:07:26 2011 +0000
@@ -1,3 +1,9 @@
+2011-07-27  Laszlo (Laca) Peter  <[email protected]>
+
+	* base-specs/opal.spec: disable parallel build (make -j) as it
+	  the optimiser seems to consume all virtual memory occasionally
+	* specs/SUNWzz-gnome-l10n.spec: disable pkgdepend on l10n pkgs
+
 2011-07-26  Padraig O'Briain  <[email protected]>
 
 	* patches/nautilus-17-background-fade.diff,
--- a/base-specs/opal.spec	Wed Jul 27 07:04:50 2011 +0000
+++ b/base-specs/opal.spec	Wed Jul 27 07:07:26 2011 +0000
@@ -103,7 +103,7 @@
 	--mandir=%{_mandir} \
 	--disable-iax
 
-make -j $CPUS
+make
 
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
--- a/specs/SUNWncurses.spec	Wed Jul 27 07:04:50 2011 +0000
+++ b/specs/SUNWncurses.spec	Wed Jul 27 07:07:26 2011 +0000
@@ -25,7 +25,7 @@
 %use ncurses = ncurses.spec 
 
 Name:                    SUNWncurses
-IPS_package_name:        library/ncurses1
+IPS_package_name:        library/ncurses
 Meta(info.classification): %{classification_prefix}:System/Libraries
 Summary:                 A CRT screen handling and optimization package.
 Version:                 %{ncurses.version}
--- a/specs/SUNWzz-gnome-l10n.spec	Wed Jul 27 07:04:50 2011 +0000
+++ b/specs/SUNWzz-gnome-l10n.spec	Wed Jul 27 07:07:26 2011 +0000
@@ -10,6 +10,7 @@
 %define owner funix
 #
 %include Solaris.inc
+%define _use_internal_dependency_generator 0
 
 Name:                    SUNWgnome-l10nmessages
 Summary:                 GNOME software message files