[ircd-hybrid/el4] Update to 7.3.1

[Keiran Smith]

commit 336bfe1a2aaeea28d81f04b2ba97feee26ba0b20
Author: Affix <affix at affix.me>
Date:   Thu Oct 27 19:46:50 2011 +0100

    Update to 7.3.1

 .gitignore       |    1 +
 ircd-hybrid.spec |   53 +++++++++++++++++++++++++++++++++--------------------
 sources          |    2 +-
 3 files changed, 35 insertions(+), 21 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 876a394..c15a087 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 ircd-hybrid-7.2.3.tgz
+/ircd-hybrid-7.3.1.tgz
diff --git a/ircd-hybrid.spec b/ircd-hybrid.spec
index 3b5d3e1..142ad37 100644
--- a/ircd-hybrid.spec
+++ b/ircd-hybrid.spec
@@ -1,4 +1,4 @@
-# $Id: ircd-hybrid.spec,v 1.10 2008/03/24 16:28:08 tanguy Exp $
+# $Id: ircd-hybrid.spec,v 1.22 2009/08/21 13:59:59 tmraz Exp $
 
 # The default (still as of 7.1.1) is only 9
 %define nicklen 51
@@ -9,14 +9,13 @@
 
 Summary: Internet Relay Chat Server
 Name: ircd-hybrid
-Version: 7.2.3
-Release: 5%{?dist}
-License: GPL
+Version: 7.3.1
+Release: 1%{?dist}
+License: GPLv2+
 Group: System Environment/Daemons
 Source0: http://ovh.dl.sourceforge.net/sourceforge/ircd-hybrid/ircd-hybrid-%{version}.tgz
 Source1: ircd-hybrid.init
 Source2: ircd-hybrid.sysconfig
-Patch0:  ircd-hybrid-7.2.0-help.diff
 URL: http://www.ircd-hybrid.org/
 BuildRequires: openssl-devel 
 Requires(pre): shadow-utils
@@ -33,7 +32,6 @@ EFNet IRC network.
 
 %prep
 %setup -q
-%patch0 -p1
 # These can't be overridden by configure :-(
 # Change config path (IRCD_PREFIX "/etc" - by default)
 # Change log path (IRCD_PREFIX "/logs" - by default)
@@ -42,8 +40,8 @@ EFNet IRC network.
 %{__perl} -pi -e 's|(^#define ETCPATH) .*|$1 "%{_sysconfdir}/ircd"|g;
                   s|(^#define LOGPATH) .*|$1 "%{_var}/log/ircd"|g' \
    include/defaults.h
-#Added for x86_64 arch support
-sed -i 's/__unused/__my_unused/g' src/lex.yy.c
+
+
 
 %build
 %configure \
@@ -71,16 +69,13 @@ sed -i 's/__unused/__my_unused/g' src/lex.yy.c
 
 # Move binaries with generic and potentially conflicting names ouf of the way
 %{__mkdir_p} %{buildroot}%{_libexecdir}/ircd/
-%{__mv} %{buildroot}%{_bindir}/{encspeed,mkpasswd} \
+%{__mv} %{buildroot}%{_bindir}/mkpasswd \
         %{buildroot}%{_libexecdir}/ircd/
 
-# Move empty directory which we changed previously (src/Makefile.in would need
-# a change too to avoid this... not worth it)
-%{__rm} -r   %{buildroot}%{_localstatedir}/logs/
 %{__mkdir_p} %{buildroot}%{_var}/log/ircd/
 
-chmod 755 %{buildroot}%{_libdir}/ircd/modules/*.so
-chmod 755 %{buildroot}%{_libdir}/ircd/modules/autoload/*.so
+chmod 755 %{buildroot}%{_libdir}/ircd-hybrid/modules/*.so
+chmod 755 %{buildroot}%{_libdir}/ircd-hybrid/modules/autoload/*.so
 
 %{__mkdir_p} %{buildroot}%{_var}/lib/ircd
 
@@ -91,7 +86,7 @@ chmod 755 %{buildroot}%{_libdir}/ircd/modules/autoload/*.so
 %pre
 getent group ircd >/dev/null || groupadd -r ircd
 getent passwd ircd >/dev/null || \
-useradd -r -g ircd -d %{_libdir}/ircd -s /sbin/nologin \
+useradd -r -g ircd -d %{_libdir}/ircd-hybrid -s /sbin/nologin \
     -c "IRC service account" ircd
 exit 0
 
@@ -112,23 +107,41 @@ fi
 
 %files
 %defattr(-, root, root, -)
-%doc BUGS ChangeLog Hybrid-team LICENSE README.FIRST RELNOTES TODO
 %doc doc/{*.txt,server-version-info,technical/}
 %doc etc/*.conf*
 %attr(770,ircd,ircd) %dir %{_sysconfdir}/ircd/
 %attr(640,ircd,ircd) %config(noreplace) %{_sysconfdir}/ircd/*
 %config(noreplace) %{_sysconfdir}/sysconfig/ircd
 %{_sysconfdir}/rc.d/init.d/ircd
-%{_bindir}/ircd
+%{_sbindir}/ircd
 %{_bindir}/servlink
-%{_libdir}/ircd
-%{_libexecdir}/ircd/
+%{_bindir}/respond
+%{_libdir}/ircd-hybrid
+%{_libexecdir}/ircd/*
 %attr(770,root,ircd) %dir %{_var}/log/ircd/
 %attr(770,ircd,ircd) %dir %{_var}/lib/ircd/
 %{_mandir}/man8/ircd.8*
-
+/usr/share/ircd-hybrid/*
 
 %changelog
+* Fri Aug 21 2009 Keiran "Affix" Smith <fedora at affix.me> - 7.3.1-1
+- Update to 7.3.1
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 7.2.3-10
+- rebuilt with new openssl
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.2.3-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.2.3-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 7.2.3-7
+- rebuild with new openssl
+
+* Thu Jul 31 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 7.2.3-6
+- fix license tag
+
 * Mon Mar 24 2008 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 7.2.3-5
 - Handle user creation like in guideline
 
diff --git a/sources b/sources
index 3269268..91b5410 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-683fe6e06635d870cfc211f360772f67  ircd-hybrid-7.2.3.tgz
+8e567e9b1b6de0dc08ab7aa90a1d600a  ircd-hybrid-7.3.1.tgz