[hercules/el6] Merge branch 'master' into el6
Dan Horák
sharkcz at fedoraproject.org
Mon Dec 10 14:26:16 UTC 2012
commit 3b827701c3aedf7003a7a5787d4df921c70d802e
Author: Dan Horák <dan at danny.cz>
Date: Mon Dec 10 14:10:22 2012 +0100
Merge branch 'master' into el6
Conflicts:
.gitignore
hercules-run
hercules.cnf
hercules.spec
sources
.gitignore | 4 +
hercules-3.08-ltdl.patch | 194 ++++++++++++++++++++++++++++++++++++++++++++++
hercules-3.08-util.patch | 48 +++++++++++
hercules-run | 15 ++++
hercules.cnf | 17 ++++
hercules.spec | 115 +++++++++++++++++++++++++++
sources | 4 +
7 files changed, 397 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 382f62f..2cf9d6e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,5 @@
hercules-3.07.tar.gz
+<<<<<<< HEAD
+=======
+/hercules-3.08.tar.gz
+>>>>>>> master
diff --git a/hercules-3.08-ltdl.patch b/hercules-3.08-ltdl.patch
new file mode 100644
index 0000000..e3da0ce
--- /dev/null
+++ b/hercules-3.08-ltdl.patch
@@ -0,0 +1,194 @@
+diff -up hercules-3.08/bootstrap.c.ltdl hercules-3.08/bootstrap.c
+--- hercules-3.08/bootstrap.c.ltdl 2012-11-18 11:43:30.000000000 +0100
++++ hercules-3.08/bootstrap.c 2012-12-08 21:46:53.000000000 +0100
+@@ -13,7 +13,7 @@
+ #include "hstdinc.h"
+ #include "hercules.h"
+ #if defined(HDL_USE_LIBTOOL)
+-#include "ltdl.h"
++#include <ltdl.h>
+ #endif
+
+ #if !defined( _MSVC_ )
+diff -up hercules-3.08/decNumber/Makefile.am.ltdl hercules-3.08/decNumber/Makefile.am
+--- hercules-3.08/decNumber/Makefile.am.ltdl 2012-12-08 21:47:13.000000000 +0100
++++ hercules-3.08/decNumber/Makefile.am 2012-12-08 21:47:33.000000000 +0100
+@@ -37,13 +37,11 @@ else
+ endif
+
+ if OPTION_DYNAMIC_LOAD
+- LTDL = ../ltdl.c
+ LIB_LD_FLAGS = -export-dynamic \
+ $(XSTATIC) \
+ -no-undefined \
+ -avoid-version
+ else
+- LTDL =
+ LIB_LD_FLAGS = $(XSTATIC) \
+ -no-undefined \
+ -avoid-version
+diff -up hercules-3.08/decNumber/Makefile.in.ltdl hercules-3.08/decNumber/Makefile.in
+--- hercules-3.08/decNumber/Makefile.in.ltdl 2012-12-08 21:47:20.000000000 +0100
++++ hercules-3.08/decNumber/Makefile.in 2012-12-08 21:48:13.000000000 +0100
+@@ -261,8 +261,6 @@ decNumber_SRC = decContext.c \
+
+ @BUILD_SHARED_FALSE at XSTATIC = -static
+ @BUILD_SHARED_TRUE at XSTATIC =
+- at OPTION_DYNAMIC_LOAD_FALSE@LTDL =
+- at OPTION_DYNAMIC_LOAD_TRUE@LTDL = ../ltdl.c
+ @OPTION_DYNAMIC_LOAD_FALSE at LIB_LD_FLAGS = $(XSTATIC) \
+ @OPTION_DYNAMIC_LOAD_FALSE@ -no-undefined \
+ @OPTION_DYNAMIC_LOAD_FALSE@ -avoid-version
+diff -up hercules-3.08/herclin.c.ltdl hercules-3.08/herclin.c
+--- hercules-3.08/herclin.c.ltdl 2012-09-07 18:21:13.000000000 +0200
++++ hercules-3.08/herclin.c 2012-12-08 21:46:53.000000000 +0100
+@@ -33,7 +33,7 @@
+ /* This must be included if HDL uses the */
+ /* libtool ltdl convenience library */
+
+-#include "ltdl.h"
++#include <ltdl.h>
+ #endif
+
+
+diff -up hercules-3.08/Makefile.am.ltdl hercules-3.08/Makefile.am
+--- hercules-3.08/Makefile.am.ltdl 2012-11-21 12:38:00.000000000 +0100
++++ hercules-3.08/Makefile.am 2012-12-08 21:46:53.000000000 +0100
+@@ -81,7 +81,7 @@ lns=@LN_S@
+
+ SUBDIRS = decNumber m4 po util html man . crypto
+
+-LDADD = @LTLIBICONV@ @LTLIBINTL@ @LIBS@
++LDADD = @LTLIBICONV@ @LTLIBINTL@ @LIBS@ -lltdl
+
+ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/decNumber
+
+@@ -169,7 +169,6 @@ endif
+
+ if OPTION_DYNAMIC_LOAD
+ DYNSRC =
+- LTDL = ltdl.c
+
+ DYNMOD_LD_FLAGS = -module \
+ -no-undefined \
+@@ -188,7 +187,6 @@ if OPTION_DYNAMIC_LOAD
+ -avoid-version
+ else
+ DYNSRC = $(dyndev_SRC)
+- LTDL =
+ DYNMOD_LD_FLAGS =
+ DYNMOD_LD_ADD =
+ LIB_LD_FLAGS = $(XSTATIC) \
+@@ -366,8 +364,7 @@ endif
+ memrchr.c \
+ parser.c \
+ pttrace.c \
+- $(FTHREADS) \
+- $(LTDL)
++ $(FTHREADS)
+
+ libhercu_la_LDFLAGS = $(LIB_LD_FLAGS)
+
+@@ -443,8 +440,7 @@ endif
+ memrchr.c \
+ $(dynamic_SRC) \
+ $(extra_SRC) \
+- $(dyndev_SRC) \
+- ltdl.c
++ $(dyndev_SRC)
+
+ libherc_la_LDFLAGS = $(LIB_LD_FLAGS)
+
+@@ -730,7 +726,6 @@ noinst_HEADERS = hostinfo.h \
+ hdl.h \
+ crypto.h \
+ sockdev.h \
+- ltdl.h \
+ herc_getopt.h \
+ service.h \
+ chsc.h \
+diff -up hercules-3.08/Makefile.in.ltdl hercules-3.08/Makefile.in
+--- hercules-3.08/Makefile.in.ltdl 2012-12-05 19:18:07.000000000 +0100
++++ hercules-3.08/Makefile.in 2012-12-08 21:46:53.000000000 +0100
+@@ -370,13 +370,12 @@ libherct_la_LINK = $(LIBTOOL) --tag=CC $
+ libhercu_la_DEPENDENCIES = $(am__DEPENDENCIES_1) libhercs.la
+ am__libhercu_la_SOURCES_DIST = version.c hscutl.c hscutl2.c codepage.c \
+ logger.c logmsg.c hdl.c hostinfo.c hsocket.c memrchr.c \
+- parser.c pttrace.c fthreads.c ltdl.c
++ parser.c pttrace.c fthreads.c
+ am__objects_5 = fthreads.lo
+ @BUILD_FTHREADS_TRUE at am__objects_6 = $(am__objects_5)
+- at OPTION_DYNAMIC_LOAD_TRUE@am__objects_7 = ltdl.lo
+ am_libhercu_la_OBJECTS = version.lo hscutl.lo hscutl2.lo codepage.lo \
+ logger.lo logmsg.lo hdl.lo hostinfo.lo hsocket.lo memrchr.lo \
+- parser.lo pttrace.lo $(am__objects_6) $(am__objects_7)
++ parser.lo pttrace.lo $(am__objects_6)
+ libhercu_la_OBJECTS = $(am_libhercu_la_OBJECTS)
+ libhercu_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+@@ -765,7 +764,7 @@ AUTOMAKE_OPTIONS = foreign 1.5
+ ACLOCAL_AMFLAGS = -I m4
+ lns = @LN_S@
+ SUBDIRS = decNumber m4 po util html man . crypto
+-LDADD = @LTLIBICONV@ @LTLIBINTL@ @LIBS@
++LDADD = @LTLIBICONV@ @LTLIBINTL@ @LIBS@ -lltdl
+ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/decNumber
+ @BUILD_HERCIFC_FALSE at HERCIFC =
+ @BUILD_HERCIFC_TRUE at HERCIFC = hercifc
+@@ -833,8 +832,6 @@ dyndev_SRC = commadpt.c \
+ @BUILD_SHARED_TRUE at XSTATIC =
+ @OPTION_DYNAMIC_LOAD_FALSE at DYNSRC = $(dyndev_SRC)
+ @OPTION_DYNAMIC_LOAD_TRUE at DYNSRC =
+- at OPTION_DYNAMIC_LOAD_FALSE@LTDL =
+- at OPTION_DYNAMIC_LOAD_TRUE@LTDL = ltdl.c
+ @OPTION_DYNAMIC_LOAD_FALSE at DYNMOD_LD_FLAGS =
+ @OPTION_DYNAMIC_LOAD_TRUE at DYNMOD_LD_FLAGS = -module \
+ @OPTION_DYNAMIC_LOAD_TRUE@ -no-undefined \
+@@ -983,8 +980,7 @@ libhercu_la_SOURCES = version.c \
+ memrchr.c \
+ parser.c \
+ pttrace.c \
+- $(FTHREADS) \
+- $(LTDL)
++ $(FTHREADS)
+
+ libhercu_la_LDFLAGS = $(LIB_LD_FLAGS)
+ libhercu_la_LIBADD = $(LDADD) libhercs.la
+@@ -1058,8 +1054,7 @@ EXTRA_libherc_la_SOURCES = $(fthreads_SR
+ memrchr.c \
+ $(dynamic_SRC) \
+ $(extra_SRC) \
+- $(dyndev_SRC) \
+- ltdl.c
++ $(dyndev_SRC)
+
+ libherc_la_LDFLAGS = $(LIB_LD_FLAGS)
+ libherc_la_LIBADD = libhercs.la \
+@@ -1302,7 +1297,6 @@ noinst_HEADERS = hostinfo.h \
+ hdl.h \
+ crypto.h \
+ sockdev.h \
+- ltdl.h \
+ herc_getopt.h \
+ service.h \
+ chsc.h \
+@@ -1711,7 +1705,6 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/logger.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/logmsg.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/losc.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ltdl.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/machchk.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/memrchr.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/omatape.Plo at am__quote@
+diff -up hercules-3.08/hdl.h.module-suffix hercules-3.08/hdl.h
+--- hercules-3.08/hdl.h.module-suffix 2012-09-07 18:21:13.000000000 +0200
++++ hercules-3.08/hdl.h 2012-12-08 22:17:55.000000000 +0100
+@@ -167,7 +167,7 @@ typedef struct _DLLENT {
+ #if defined(_MSVC_)
+ #define HDL_MODULE_SUFFIX ".dll"
+ #else
+- #define HDL_MODULE_SUFFIX ".la"
++ #define HDL_MODULE_SUFFIX ".so"
+ #endif
+ #endif
+
diff --git a/hercules-3.08-util.patch b/hercules-3.08-util.patch
new file mode 100644
index 0000000..16b49b1
--- /dev/null
+++ b/hercules-3.08-util.patch
@@ -0,0 +1,48 @@
+diff -up hercules-3.08/configure.ac.util hercules-3.08/configure.ac
+--- hercules-3.08/configure.ac.util 2012-12-01 18:20:23.000000000 +0100
++++ hercules-3.08/configure.ac 2012-12-01 18:20:38.000000000 +0100
+@@ -1974,7 +1974,7 @@ AM_CONDITIONAL( USE_DLLTOOL, [ t
+
+ 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)
+diff -up hercules-3.08/configure.util hercules-3.08/configure
+--- hercules-3.08/configure.util 2012-12-01 18:20:27.000000000 +0100
++++ hercules-3.08/configure 2012-12-01 18:20:50.000000000 +0100
+@@ -28272,7 +28272,7 @@ $as_echo "$as_me: not updating unwritabl
+ fi
+ rm -f confcache
+
+-ac_config_files="$ac_config_files Makefile util/Makefile html/Makefile crypto/Makefile po/Makefile.in po/Makefile man/Makefile m4/Makefile decNumber/Makefile"
++ac_config_files="$ac_config_files Makefile html/Makefile crypto/Makefile po/Makefile.in po/Makefile man/Makefile m4/Makefile decNumber/Makefile"
+
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+diff -up hercules-3.08/Makefile.am.util hercules-3.08/Makefile.am
+--- hercules-3.08/Makefile.am.util 2012-12-01 18:19:59.000000000 +0100
++++ hercules-3.08/Makefile.am 2012-12-01 18:20:07.000000000 +0100
+@@ -79,7 +79,7 @@ ACLOCAL_AMFLAGS = -I m4
+
+ lns=@LN_S@
+
+-SUBDIRS = decNumber m4 po util html man . crypto
++SUBDIRS = decNumber m4 po html man . crypto
+
+ LDADD = @LTLIBICONV@ @LTLIBINTL@ @LIBS@ -lltdl
+
+diff -up hercules-3.08/Makefile.in.util hercules-3.08/Makefile.in
+--- hercules-3.08/Makefile.in.util 2012-12-01 18:19:54.000000000 +0100
++++ hercules-3.08/Makefile.in 2012-12-01 18:20:15.000000000 +0100
+@@ -763,7 +763,7 @@ top_srcdir = @top_srcdir@
+ AUTOMAKE_OPTIONS = foreign 1.5
+ ACLOCAL_AMFLAGS = -I m4
+ lns = @LN_S@
+-SUBDIRS = decNumber m4 po util html man . crypto
++SUBDIRS = decNumber m4 po html man . crypto
+ LDADD = @LTLIBICONV@ @LTLIBINTL@ @LIBS@ -lltdl
+ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/decNumber
+ @BUILD_HERCIFC_FALSE at HERCIFC =
diff --git a/hercules-run b/hercules-run
index 05ea5b9..28dccbf 100755
--- a/hercules-run
+++ b/hercules-run
@@ -27,6 +27,10 @@ for module in tun ip_tables iptable_filter ip_conntrack_ftp ip_nat_ftp; do
done
# Enable IP forwarding
+<<<<<<< HEAD
+=======
+ip_forward=`sysctl -n net.ipv4.ip_forward`
+>>>>>>> master
sysctl -w net.ipv4.ip_forward=1 >/dev/null
# Masquerade the hercules network.
@@ -35,5 +39,16 @@ iptables -A FORWARD -i eth0 -o tun0 -m state --state ESTABLISHED,RELATED -j ACCE
# Start hercules itself.
cd /etc/hercules
+<<<<<<< HEAD
hercules
+=======
+hercules $@
+
+# Remove the firewall rules
+iptables -D FORWARD -i eth0 -o tun0 -m state --state ESTABLISHED,RELATED -j ACCEPT
+iptables -t nat -D POSTROUTING -s ${HERCNET} -j MASQUERADE
+
+# Set value of ip_forward back
+sysctl -w net.ipv4.ip_forward=$ip_forward >/dev/null
+>>>>>>> master
diff --git a/hercules.cnf b/hercules.cnf
index 9e1500e..979dfbc 100644
--- a/hercules.cnf
+++ b/hercules.cnf
@@ -2,17 +2,27 @@
# the Hercules ESA/390 emulator
CPUSERIAL 002623 # CPU serial number
+<<<<<<< HEAD
CPUMODEL 3090 # CPU model number: 3090, 7490, 2064
MAINSIZE 256 # Main storage size in megabytes
+=======
+CPUMODEL 2064 # CPU model number: 3090, 7490, 2064
+MAINSIZE 512 # Main storage size in megabytes
+>>>>>>> master
NUMCPU 1 # Number of CPUs
CNSLPORT 3270 # TCP port number to which consoles connect
#HTTPPORT 8081 # enable a HTTP server on this port
OSTAILOR LINUX # OS tailoring
LOADPARM 0120.... # IPL parameter
+<<<<<<< HEAD
IODELAY 0 # modern kernels do not need a delay
ARCHMODE ESA/390 # Architecture mode S/370, ESA/390 or ESAME
TZOFFSET +0100 # Central Europe
MODPATH @LIBDIR@/hercules
+=======
+ARCHMODE ESAME # Architecture mode S/370, ESA/390 or ESAME
+TZOFFSET +0100 # Central Europe
+>>>>>>> master
LDMOD hdt3088.so hdt3420.so hdt3505.so
# .----------------- Device number
@@ -36,7 +46,11 @@ LDMOD hdt3088.so hdt3420.so hdt3505.so
#0200 3270
#0201 3270
# tape drives
+<<<<<<< HEAD
0580 3420 /etc/hercules/tape.tdf
+=======
+#0580 3420 /etc/hercules/tape.tdf
+>>>>>>> master
#0581 3420 /dev/st0
#0582 3420 ickdsf.ipl
# networking, channel-to-channel adapter
@@ -44,4 +58,7 @@ LDMOD hdt3088.so hdt3420.so hdt3505.so
0601 3088 CTCI -n /dev/net/tun -t 1500 192.168.200.3 192.168.200.4
# networking, LCS adaptor
#0700 3088 LCS 192.168.200.4 -n /dev/net/tun -m 01:02:03:04:05:06
+<<<<<<< HEAD
+=======
+>>>>>>> master
diff --git a/hercules.spec b/hercules.spec
index 9943c02..7acd710 100644
--- a/hercules.spec
+++ b/hercules.spec
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
#%global svnrev 5591
#%global svndate 20100105
@@ -12,20 +13,39 @@ 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
+=======
+Summary: Hercules S/370, ESA/390, and z/Architecture emulator
+Name: hercules
+Version: 3.08
+Release: 1%{?dist}
+License: QPL
+Group: Applications/Emulators
+URL: http://www.hercules-390.eu/
+Source0: http://downloads.hercules-390.eu/%{name}-%{version}.tar.gz
+>>>>>>> master
Source1: hercules.cnf
Source2: hercules-run
Source3: README-rpm
Source4: generic.prm
+<<<<<<< HEAD
Patch0: %{name}-3.05-make.patch
Patch1: %{name}-3.06-ltdl.patch
Patch2: %{name}-intltoolize.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+=======
+Patch0: %{name}-3.08-ltdl.patch
+Patch1: %{name}-3.08-util.patch
+>>>>>>> master
BuildRequires: zlib-devel
BuildRequires: bzip2-devel
BuildRequires: libcap-devel
BuildRequires: libtool
BuildRequires: libtool-ltdl-devel
+<<<<<<< HEAD
BuildRequires: intltool
+=======
+
+>>>>>>> master
%description
Hercules is an emulator for the IBM System/370, ESA/390, and z/Architecture
@@ -37,6 +57,7 @@ printer-keyboard, 3270 terminal, and 3287 printer devices.
%prep
+<<<<<<< HEAD
#%setup -q -n %{name}
%setup -q
%patch0 -p0
@@ -60,6 +81,19 @@ sed -i 's|\${DESTPREFIX}/lib/|%{_libdir}/|g' configure*
%{__chmod} -x util/*
# remove Makefile
%{__rm} util/Makefile*
+=======
+%setup -q
+%patch0 -p1 -b .ltdl
+%patch1 -p1 -b .util
+
+# remove unbundled stuff
+rm ltdl.[ch]
+
+# Scripts to be looked at, not executed from the docs
+chmod -x util/*
+# remove Makefile
+rm util/Makefile*
+>>>>>>> master
%build
@@ -68,6 +102,7 @@ sed -i 's|\${DESTPREFIX}/lib/|%{_libdir}/|g' configure*
--enable-dependency-tracking \
--enable-optimization="%{optflags}"
+<<<<<<< HEAD
%{__make} %{?_smp_mflags}
@@ -97,12 +132,54 @@ sed -i 's|\${DESTPREFIX}/lib/|%{_libdir}/|g' configure*
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc CHANGES README* RELEASE* hercules.cnf html/ util/
+=======
+# we want system libtool
+rm libtool
+
+make %{?_smp_mflags} LIBTOOL=libtool
+
+
+%install
+make install DESTDIR=%{buildroot} LIBTOOL=libtool
+
+%find_lang %{name}
+
+mkdir -p %{buildroot}%{_sysconfdir}/hercules
+# Install config files
+install -p -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/hercules/
+install -p -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/hercules/
+
+# Install our wrapper script (takes care of tunnel networking)
+install -D -p -m 0755 %{SOURCE2} %{buildroot}%{_sbindir}/hercules-run
+
+# Copy our README to be included as doc
+install -p -m 0644 %{SOURCE3} README-rpm
+
+# Create empty directory where to store system images
+mkdir -p %{buildroot}%{_sharedstatedir}/hercules
+
+# Remove Makefile from html docs
+rm html/Makefile*
+
+# Remove libtool archives
+rm %{buildroot}%{_libdir}/hercules/*.a
+rm %{buildroot}%{_libdir}/hercules/*.la
+rm %{buildroot}%{_libdir}/*.a
+rm %{buildroot}%{_libdir}/*.la
+
+
+%files -f %{name}.lang
+%doc COPYRIGHT README-rpm
+%doc README.{COMMADPT,DYNMOD,ECPSVM,HAO,HDL,HERCLOGO,NETWORKING,TAPE}
+%doc RELEASE.NOTES hercules.cnf html/ util/
+>>>>>>> master
%dir %{_sysconfdir}/hercules/
%attr(0644, root, root) %config(noreplace) %{_sysconfdir}/hercules/hercules.cnf
%attr(0644, root, root) %config(noreplace) %{_sysconfdir}/hercules/generic.prm
%{_bindir}/*
%{_sbindir}/*
%{_datadir}/hercules/
+<<<<<<< HEAD
%{_libdir}/hercules/
%exclude %{_libdir}/hercules/*.la
%{_libdir}/*.so
@@ -120,6 +197,44 @@ sed -i 's|\${DESTPREFIX}/lib/|%{_libdir}/|g' configure*
* Sun Dec 27 2009 Dan Horák <dan[at]danny.cz> 3.06-7.20091227svn5570
- updated to svn revision 5570
+=======
+%dir %{_libdir}/hercules/
+%{_libdir}/hercules/*.so
+%{_libdir}/*.so
+%{_mandir}/man?/*
+%dir %{_sharedstatedir}/hercules/
+
+
+%changelog
+* Sat Dec 08 2012 Dan Horák <dan[at]danny.cz> - 3.08-1
+- updated to 3.08
+- remove firewall rules after hercules finish in the hercules-run wrapper script (#884311)
+
+* Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.07-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.07-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.07-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Tue Mar 16 2010 Dan Horák <dan[at]danny.cz> 3.07-1
+- updated to 3.07
+
+* Tue Jan 5 2010 Dan Horák <dan[at]danny.cz> 3.06-9.20100105svn5591
+- updated to svn revision 5591
+
+* Sun Dec 27 2009 Dan Horák <dan[at]danny.cz> 3.06-8.20091227svn5570
+- updated to svn revision 5570
+- dropped the force-hfp-unnormalized patch, because the feature is now implemented
+
+* Mon Dec 14 2009 Dan Horák <dan[at]danny.cz> 3.06-7.20091214svn5544
+- updated to svn revision 5544
+- added workaround for booting Fedora kernels requiring z9 or better
+- spec cleanup
+- updated default config
+>>>>>>> master
* Sat Sep 26 2009 Dan Horák <dan[at]danny.cz> 3.06-6
- rebuilt to use POSIX capabilities
diff --git a/sources b/sources
index 6722f4d..4b34d3a 100644
--- a/sources
+++ b/sources
@@ -1 +1,5 @@
+<<<<<<< HEAD
a12aa1645b0695b25b7fc0c9a3ccab3a hercules-3.07.tar.gz
+=======
+0d81ccb716c8ea6910a729c082680ca6 hercules-3.08.tar.gz
+>>>>>>> master
More information about the scm-commits
mailing list