rpms/hercules/EL-5 hercules-intltoolize.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 hercules.spec, 1.17, 1.18 sources, 1.7, 1.8 hercules-3.06-extgui.patch, 1.1, NONE hercules-3.06-preproc.patch, 1.1, NONE

[Dan Horák]

Author: sharkcz

Update of /cvs/pkgs/rpms/hercules/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9733

Modified Files:
	.cvsignore hercules.spec sources 
Added Files:
	hercules-intltoolize.patch 
Removed Files:
	hercules-3.06-extgui.patch hercules-3.06-preproc.patch 
Log Message:
* Tue Mar 16 2010 Dan Horák <dan[at]danny.cz> 3.07-1
- updated to 3.07


hercules-intltoolize.patch:
 configure.ac |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE hercules-intltoolize.patch ---
>From 6c072a76206f35323788f4a70b9d8e8570dc25c6 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Mon, 14 Dec 2009 17:07:37 +0100
Subject: [PATCH] add support for intltoolize

---
 configure.ac |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/configure.ac b/configure.ac
index 0eee5c9..85a2886 100644
--- a/configure.ac
+++ b/configure.ac
@@ -200,6 +200,9 @@ AC_MSG_NOTICE( [(use of lt_dlopen forced by Hercules Dynamic Loader requirement)
 hc_cv_have_lt_dlopen=yes
 
 
+IT_PROG_INTLTOOL
+GETTEXT_PACKAGE=hercules
+AC_SUBST(GETTEXT_PACKAGE)
 
 AM_GNU_GETTEXT([external])              #
 AM_ICONV
-- 
1.6.3.3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hercules/EL-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	19 Feb 2009 06:55:30 -0000	1.7
+++ .cvsignore	16 Mar 2010 16:30:41 -0000	1.8
@@ -1 +1 @@
-hercules-3.06.tar.gz
+hercules-3.07.tar.gz


Index: hercules.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hercules/EL-5/hercules.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- hercules.spec	7 Sep 2009 10:06:19 -0000	1.17
+++ hercules.spec	16 Mar 2010 16:30:41 -0000	1.18
@@ -1,22 +1,31 @@
+#%global svnrev 5570
+#%global svndate 20091227
+
 Summary: Hercules S/370, ESA/390, and z/Architecture emulator
 Name: hercules
-Version: 3.06
-Release: 2%{?dist}
+Version: 3.07
+#Release: 3.%{svndate}svn%{svnrev}%{?dist}
+Release: 1%{?dist}
 License: QPL
 Group: Applications/Emulators
 URL: http://www.hercules-390.org/
 Source0: http://www.hercules-390.org/hercules-%{version}.tar.gz
+# fedora-getsvn hercules svn://svn.hercules-390.org/hercules/trunk %{svnrev}
+#Source0: %{name}-svn%{svnrev}.tar.bz2
 Source1: hercules.cnf
 Source2: hercules-run
 Source3: README-rpm
 Source4: generic.prm
 Patch0: %{name}-3.05-make.patch
 Patch1: %{name}-3.06-ltdl.patch
-Patch2: %{name}-3.06-preproc.patch
-Patch3: %{name}-3.06-extgui.patch
+Patch2: %{name}-intltoolize.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: bison, zlib-devel, bzip2-devel
-BuildRequires: libtool libtool-ltdl-devel
+BuildRequires: zlib-devel
+BuildRequires: bzip2-devel
+BuildRequires: libcap-devel
+BuildRequires: libtool
+BuildRequires: libtool-ltdl-devel
+BuildRequires: intltool
 
 %description
 Hercules is an emulator for the IBM System/370, ESA/390, and z/Architecture
@@ -28,17 +37,19 @@ printer-keyboard, 3270 terminal, and 328
 
 
 %prep
+#%setup -q -n %{name}
 %setup -q
 %patch0 -p0
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 # refresh for recent libtool
 rm autoconf/libtool.m4
 libtoolize --copy --force
 
 # refresh buildsystem
+ln -sf ../po autoconf/po
+intltoolize -f
 aclocal -I m4 -I autoconf
 autoheader
 automake
@@ -58,6 +69,9 @@ sed -i 's|\${DESTPREFIX}/lib/|%{_libdir}
     --enable-dependency-tracking \
     --enable-optimization="%{optflags}"
 
+# set required variable not set by configure
+sed -i 's|@DATADIRNAME@|share|g' po/Makefile
+
 %{__make} %{?_smp_mflags}
 
 
@@ -102,6 +116,12 @@ sed -i 's|\${DESTPREFIX}/lib/|%{_libdir}
 
 
 %changelog
+* Tue Mar 16 2010 Dan Horák <dan[at]danny.cz> 3.07-1
+- updated to 3.07
+
+* Sun Dec 27 2009 Dan Horák <dan[at]danny.cz> 3.06-3.20091227svn5570
+- updated to svn revision 5570
+
 * Mon Sep  7 2009 Dan Horák <dan[at]danny.cz> 3.06-2
 - enable support for external gui
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hercules/EL-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	19 Feb 2009 06:55:30 -0000	1.7
+++ sources	16 Mar 2010 16:30:41 -0000	1.8
@@ -1 +1 @@
-3a356b251e2b7fc49ac2b7244d12d50b  hercules-3.06.tar.gz
+a12aa1645b0695b25b7fc0c9a3ccab3a  hercules-3.07.tar.gz


--- hercules-3.06-extgui.patch DELETED ---


--- hercules-3.06-preproc.patch DELETED ---