[svn] r9792 - in /trunk/rpms: erlang/erlang.spec erlang/otp-R14A-0001-Do-not-format-man-pages.patch wxGTK/wxGTK.spec

Steve Huff shuff at vecna.org
Thu Mar 31 20:06:59 CEST 2011


Author: shuff
Date: Thu Mar 31 19:06:58 2011
New Revision: 9792

URL: http://svn.rpmforge.net/viewvc/rpmforge?rev=9792&view=rev
Log:
updated erlang to R14B02 (with updated wxGTK for dependency)
captured missing patch :(

Added:
    trunk/rpms/erlang/otp-R14A-0001-Do-not-format-man-pages.patch
Modified:
    trunk/rpms/erlang/erlang.spec
    trunk/rpms/wxGTK/wxGTK.spec

Modified: trunk/rpms/erlang/erlang.spec
URL: http://svn.rpmforge.net/viewvc/rpmforge/trunk/rpms/erlang/erlang.spec?rev=9792&r1=9791&r2=9792&view=diff
==============================================================================
--- trunk/rpms/erlang/erlang.spec (original)
+++ trunk/rpms/erlang/erlang.spec Thu Mar 31 19:06:58 2011
@@ -2,8 +2,11 @@
 # Authority: shuff
 # ExcludeDist: el3
 
+%{?el5:%define _with_java142 1}
+%{?el4:%define _with_java142 1}
+
 Name: erlang
-Version: R14A
+Version: R14B02
 Release: 1%{?dist}
 Summary: General-purpose programming language and runtime environment
 License: ERPL
@@ -17,7 +20,8 @@
 Patch2: otp-R12B-5-0005-Fix-missing-ssl-libraries-in-EPEL.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
-BuildRequires: java-1.4.2-gcj-compat-devel
+%{?_with_java_142:BuildRequires: java-1.4.2-gcj-compat-devel}
+%{!?_with_java_142:BuildRequires: java-devel >= 1.5}
 BuildRequires: flex
 BuildRequires: gd-devel
 BuildRequires: keyutils-libs-devel
@@ -27,6 +31,7 @@
 BuildRequires: tcl-devel
 BuildRequires: tk-devel
 BuildRequires: unixODBC-devel
+BuildRequires: wxGTK-devel
 
 Requires: tk
 
@@ -111,7 +116,8 @@
     --enable-threads \
     --enable-smp-support \
     --enable-kernel-poll \
-    --enable-hipe
+    --enable-hipe \
+    --disable-halfword-emulator
 %{__chmod} -R u+w .
 %{__make}
 
@@ -159,8 +165,14 @@
 %{_libdir}/erlang/Install -minimal %{_libdir}/erlang &>/dev/null
 
 %changelog
+* Thu Mar 31 2011 Steve Huff <shuff at vecna.org> - R14B02-1
+- Updated to version R14B02.
+- HiPE and the halfword emulator cannot currently coexist.
+- We can use a more modern Java on el6.
+- Captured WxWidgets dependency.
+
 * Thu Sep 02 2010 Steve Huff <shuff at vecna.org> - R14A-1
-- Upgraded to version R14A.
+- Updated to version R14A.
 
 * Fri Jul 02 2010 Steve Huff <shuff at vecna.org> - R12B-5.12
 - Argh, Erlang uses standard man page format, but its man pages really are

Added: trunk/rpms/erlang/otp-R14A-0001-Do-not-format-man-pages.patch
URL: http://svn.rpmforge.net/viewvc/rpmforge/trunk/rpms/erlang/otp-R14A-0001-Do-not-format-man-pages.patch?rev=9792&view=markup
==============================================================================
--- trunk/rpms/erlang/otp-R14A-0001-Do-not-format-man-pages.patch (added)
+++ trunk/rpms/erlang/otp-R14A-0001-Do-not-format-man-pages.patch Thu Mar 31 19:06:58 2011
@@ -1,0 +1,18 @@
+diff -Naur otp_src_R14A-orig/erts/etc/unix/Install.src otp_src_R14A/erts/etc/unix/Install.src
+--- otp_src_R14A-orig/erts/etc/unix/Install.src	2010-06-11 11:29:43.000000000 -0400
++++ otp_src_R14A/erts/etc/unix/Install.src	2010-09-17 16:09:13.000000000 -0400
+@@ -140,14 +140,4 @@
+ cp -p $Name.boot start.boot
+ cp -p ../releases/%I_SYSTEM_VSN%/$Name.script start.script
+ 
+-#
+-# Fixing the man pages
+-#
+-
+-if [ -d $ERL_ROOT/man ]
+-then
+-    cd $ERL_ROOT
+-    ./misc/format_man_pages $ERL_ROOT
+-fi
+-
+ exit 0

Modified: trunk/rpms/wxGTK/wxGTK.spec
URL: http://svn.rpmforge.net/viewvc/rpmforge/trunk/rpms/wxGTK/wxGTK.spec?rev=9792&r1=9791&r2=9792&view=diff
==============================================================================
--- trunk/rpms/wxGTK/wxGTK.spec (original)
+++ trunk/rpms/wxGTK/wxGTK.spec Thu Mar 31 19:06:58 2011
@@ -13,17 +13,17 @@
 
 Summary: The GTK port of the wxWindows library
 Name: wxGTK
-Version: 2.8.10
+Version: 2.8.12
 Release: 1%{?dist}
 License: wxWidgets Library Licence
 Group: System Environment/Libraries
 URL: http://www.wxwindows.org/
 
-Source: http://dl.sf.net/wxwindows/wxGTK-%{version}.tar.bz2
+Source: http://downloads.sourceforge.net/project/wxwindows/%{version}/wxGTK-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %{!?_without_cairo:BuildRequires: cairo-devel}
-BuildRequires: cppunit-devel
+BuildRequires: cppunit-devel >= 1.8.0
 BuildRequires: expat-devel
 BuildRequires: gcc-c++
 BuildRequires: GConf2-devel
@@ -150,6 +150,9 @@
 %{_libdir}/libwx_*.so
 
 %changelog
+* Thu Mar 31 2011 Steve Huff <shuff at vecna.org> - 2.8.12-1
+- Updated to release 2.8.12.
+
 * Mon May 25 2009 Dag Wieers <dag at wieers.com> - 2.8.10-1
 - Updated to release 2.8.10.
 




More information about the commits mailing list