rpms/hercules/devel hercules-3.05-make.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 hercules.spec, 1.21, 1.22 sources, 1.6, 1.7 hercules-3.05-open.patch, 1.1, NONE

[Dan Horák]

Author: sharkcz

Update of /cvs/pkgs/rpms/hercules/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23658

Modified Files:
	.cvsignore hercules.spec sources 
Added Files:
	hercules-3.05-make.patch 
Removed Files:
	hercules-3.05-open.patch 
Log Message:
* Thu Oct 09 2008 Dan Horak <dan[at]danny.cz> 3.05-7.20081009cvs
- update to CVS snapshot 20081009 (#461044)
- install utils only as docs
- little cleanup


hercules-3.05-make.patch:

--- NEW FILE hercules-3.05-make.patch ---
Index: Makefile.am
===================================================================
RCS file: /usr/cvs/hercules/hercules/Makefile.am,v
retrieving revision 1.183
diff -u -r1.183 Makefile.am
--- Makefile.am	22 May 2008 19:25:58 -0000	1.183
+++ Makefile.am	9 Oct 2008 13:27:50 -0000
@@ -65,7 +65,7 @@
 
 lns=@LN_S@
 
-SUBDIRS = decNumber m4 po util html man . crypto
+SUBDIRS = decNumber m4 po html man . crypto
 
 LDADD = @LTLIBICONV@ @LTLIBINTL@ @LIBS@
 
Index: configure.ac
===================================================================
RCS file: /usr/cvs/hercules/hercules/configure.ac,v
retrieving revision 1.197
diff -u -r1.197 configure.ac
--- configure.ac	25 Mar 2008 11:41:31 -0000	1.197
+++ configure.ac	9 Oct 2008 13:27:50 -0000
@@ -2077,7 +2077,7 @@
 
 AC_CACHE_SAVE()
 
-AC_OUTPUT( [ Makefile util/Makefile html/Makefile crypto/Makefile po/Makefile.in po/Makefile man/Makefile m4/Makefile decNumber/Makefile] )
+AC_OUTPUT( [ Makefile html/Makefile crypto/Makefile po/Makefile.in po/Makefile man/Makefile m4/Makefile decNumber/Makefile] )
 
 ###############################################################################
 #   (end-of-file)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hercules/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	5 Aug 2007 11:24:01 -0000	1.6
+++ .cvsignore	9 Oct 2008 14:27:42 -0000	1.7
@@ -1 +1 @@
-hercules-3.05.tar.gz
+hercules-3.05-20081009.tar.gz


Index: hercules.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hercules/devel/hercules.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- hercules.spec	10 Apr 2008 15:21:47 -0000	1.21
+++ hercules.spec	9 Oct 2008 14:27:42 -0000	1.22
@@ -1,18 +1,25 @@
+%define cvsdate 20081009
+
 Summary: Hercules S/370, ESA/390, and z/Architecture emulator
 Name: hercules
 Version: 3.05
-Release: 5%{?dist}
+Release: 7.%{cvsdate}cvs%{?dist}
 License: QPL
 Group: Applications/Emulators
 URL: http://www.hercules-390.org/
-Source0: http://www.hercules-390.org/hercules-%{version}.tar.gz
+#Source0: http://www.hercules-390.org/hercules-%{version}.tar.gz
+# CVS snapshot; use commands below to reproduce
+# cvs -d :pserver:anonymous at cvs.hercules-390.org:/usr/cvs/hercules co -D %{cvsdate} hercules
+# cd hercules; sh ./autogen.sh && ./configure && make dist
+Source0: hercules-%{version}-%{cvsdate}.tar.gz
 Source1: hercules.cnf
 Source2: hercules-run
 Source3: README-rpm
 Source4: generic.prm
-Patch0: hercules-3.05-open.patch
+Patch0: %{name}-3.05-make.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: bison, zlib-devel, bzip2-devel
+BuildRequires: libtool
 Obsoletes: hercules-docs <= 3.01
 
 %description
@@ -26,22 +33,29 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .open
+%patch0 -p0
+
+# refresh for recent libtool
+rm autoconf/libtool.m4
+libtoolize --copy --force
+aclocal -I m4 -I autoconf
+autoheader
+automake
+autoconf
+
 # Get the modules in the right place (lib64 on 64bit archs)
 sed -i 's|\${DESTPREFIX}/lib/|%{_libdir}/|g' configure*
 # Scripts to be looked at, not executed from the docs
 %{__chmod} -x util/*
+# remove Makefile
+%{__rm} util/Makefile*
+
 
 %build
 %configure \
     --enable-dependency-tracking \
     --enable-optimization="%{optflags}"
-# cleanup dlopen related mess configure makes, easier then patching up autohell
-sed -i -e 's|/\* #undef LTDL_SHLIB_EXT \*/|#define LTDL_SHLIB_EXT ".so"|' \
-  -e 's|"/lib:/usr/lib"|"/%{_lib}:/usr/%{_lib}"|g' config.h
-# <sigh> even more broken autohell, remove rpath setting
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
 %{__make} %{?_smp_mflags}
 
 
@@ -86,6 +100,11 @@
 
 
 %changelog
+* Thu Oct 09 2008 Dan Horak <dan[at]danny.cz> 3.05-7.20081009cvs
+- update to CVS snapshot 20081009 (#461044)
+- install utils only as docs
+- little cleanup
+
 * Thu Apr 10 2008 Jarod Wilson <jwilson at redhat.com> 3.05-5
 - Point to new project URL
 - Add a template generic.prm matching provided hercules.cnf


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hercules/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	5 Aug 2007 11:24:01 -0000	1.6
+++ sources	9 Oct 2008 14:27:42 -0000	1.7
@@ -1 +1 @@
-da8d85ac18c140b460574a0454abb936  hercules-3.05.tar.gz
+9c3719547c6e40160ff4cfb9a664fd05  hercules-3.05-20081009.tar.gz


--- hercules-3.05-open.patch DELETED ---