[ircd-hybrid/el6] Spec Fixes

Keiran Smith affix at fedoraproject.org
Thu Oct 27 18:32:16 UTC 2011


commit 0e2c0c2d73c3d5e7f29af656e79c8673a96af4e7
Author: Affix <affix at affix.me>
Date:   Thu Oct 27 19:32:06 2011 +0100

    Spec Fixes

 ircd-hybrid.spec |   19 ++++++++-----------
 1 files changed, 8 insertions(+), 11 deletions(-)
---
diff --git a/ircd-hybrid.spec b/ircd-hybrid.spec
index f1f0b74..142ad37 100644
--- a/ircd-hybrid.spec
+++ b/ircd-hybrid.spec
@@ -72,13 +72,10 @@ EFNet IRC network.
 %{__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
 
@@ -89,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
 
@@ -110,21 +107,21 @@ 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


More information about the scm-commits mailing list