- up to 1.6.21

  add ssl bcond
  builds without ssl

Changed files:
    eggdrop-FHS.patch -> 1.7
    eggdrop-doc_makefile.patch -> 1.4
    eggdrop-nolibs.patch -> 1.3
    eggdrop-topicprot.patch -> 1.5
    eggdrop.spec -> 1.121

diff --git a/eggdrop-FHS.patch b/eggdrop-FHS.patch
index 460c15fcb6ab2db793ae7418f435a2363d47b726..6eea9639af3b7ba1592d6b4cbeea65cb3c22385c 100644 (file)
--- a/eggdrop-FHS.patch
+++ b/eggdrop-FHS.patch
@@ -1,206 +1,5 @@
-diff -burNp eggdrop1.6.19/configure eggdrop1.6.19.new/configure
---- eggdrop1.6.19/configure    2008-04-19 06:21:20.000000000 +0200
-+++ eggdrop1.6.19.new/configure        2008-09-22 09:29:38.000000000 +0200
-@@ -315,7 +315,8 @@ ac_includes_default="\
- # include <unistd.h>
- #endif"
- 
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS egg_ac_parameters CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE RANLIB ac_ct_RANLIB LN_S HEAD_1 STRIP AWK BASENAME UNAME DEFAULT_MAKE MOD_EXT MODULE_XLIBS MOD_LD MOD_CC MOD_STRIP SHLIB_LD SHLIB_CC SHLIB_STRIP EGGEXEC TCLLIB TCLLIBFN TCLINC TCLINCFN TCL_REQS TCL_LIBS EGGVERSION DEST MOD_UPDIR LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS egg_ac_parameters CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE RANLIB ac_ct_RANLIB LN_S HEAD_1 STRIP AWK BASENAME UNAME DEFAULT_MAKE MOD_EXT MODULE_XLIBS MOD_LD MOD_CC MOD_STRIP SHLIB_LD SHLIB_CC SHLIB_STRIP EGGEXEC TCLLIB TCLLIBFN TCLINC TCLINCFN TCL_REQS TCL_LIBS EGGVERSION DESTDIR MOD_UPDIR LIBOBJS LTLIBOBJS'
-+
- ac_subst_files=''
- 
- # Initialize some variables set by options.
-@@ -10129,8 +10130,8 @@ _ACEOF
- 
- 
- 
--  if test "${DEST-x}" = "x"; then
--    DEST=\${prefix}
-+  if test "${DESTDIR-x}" = "x"; then
-+    DESTDIR=\${prefix}
-   fi
- 
- 
-@@ -10828,7 +10829,7 @@ s,@TCLINCFN@,$TCLINCFN,;t t
- s,@TCL_REQS@,$TCL_REQS,;t t
- s,@TCL_LIBS@,$TCL_LIBS,;t t
- s,@EGGVERSION@,$EGGVERSION,;t t
--s,@DEST@,$DEST,;t t
-+s,@DESTDIR@,$DESTDIR,;t t
- s,@MOD_UPDIR@,$MOD_UPDIR,;t t
- s,@LIBOBJS@,$LIBOBJS,;t t
- s,@LTLIBOBJS@,$LTLIBOBJS,;t t
-diff -burNp eggdrop1.6.19/doc/html/compiling.html eggdrop1.6.19.new/doc/html/compiling.html
---- eggdrop1.6.19/doc/html/compiling.html      2008-02-16 22:40:58.000000000 +0100
-+++ eggdrop1.6.19.new/doc/html/compiling.html  2008-09-22 09:32:52.000000000 +0200
-@@ -147,7 +147,7 @@
- 
-         <blockquote>
- <pre>
--make install DEST=&lt;directory&gt;
-+make install DESTDIR=&lt;directory&gt;
- </pre>
-         </blockquote>
- 
-@@ -155,7 +155,7 @@ make install DEST=&lt;directory&gt;
- 
-         <blockquote>
- <pre>
--make install DEST=/home/user/otherdir
-+make install DESTDIR=/home/user/otherdir
- </pre>
-         </blockquote>
-       </ol>
-@@ -255,7 +255,7 @@ sh5 ./configure --with-tclinc=&#39;&lt;f
- 
-           <blockquote>
- <pre>
--gmake install DEST=&#39;directory&#39;
-+gmake install DESTDIR=&#39;directory&#39;
- </pre>
-           </blockquote>
- 
-@@ -263,7 +263,7 @@ gmake install DEST=&#39;directory&#39;
- 
-           <blockquote>
- <pre>
--gmake install DEST=/home/user/otherdir
-+gmake install DESTDIR=/home/user/otherdir
- </pre>
-           </blockquote></li>
-         </ol>
-@@ -389,14 +389,14 @@ tar -zxf eggdrop1.6.19.tar.gz
- 
-           <li>Compile the bot using &#39;make eggdrop&#39;.<br><br></li>
- 
--          <li>Install the bot by typing &#39;make install DEST=&lt;install
-+          <li>Install the bot by typing &#39;make install DESTDIR=&lt;install
-           path&gt;&#39;.<br><br>
- 
-           For example:
- 
-           <blockquote>
- <pre>
--make install DEST=&#39;C:/eggdrop/&#39;
-+make install DESTDIR=&#39;C:/eggdrop/&#39;
- </pre>
-           </blockquote>
- 
-diff -burNp eggdrop1.6.19/doc/html/faqs.html eggdrop1.6.19.new/doc/html/faqs.html
---- eggdrop1.6.19/doc/html/faqs.html   2008-02-16 22:40:58.000000000 +0100
-+++ eggdrop1.6.19.new/doc/html/faqs.html       2008-09-22 09:36:32.000000000 +0200
-@@ -254,7 +254,7 @@
- 
-           <li>
-             <p>If it&#39;s not your machine, you may have to resort to &#39;make
--            static&#39; and &#39;make install DEST=&quot;path&quot;&#39; to make
-+            static&#39; and &#39;make install DESTDIR=&quot;path&quot;&#39; to make
-             and install your bot.</p>
-           </li>
- 
-diff -burNp eggdrop1.6.19/doc/html/install.html eggdrop1.6.19.new/doc/html/install.html
---- eggdrop1.6.19/doc/html/install.html        2008-02-16 22:40:58.000000000 +0100
-+++ eggdrop1.6.19.new/doc/html/install.html    2008-09-22 09:39:15.000000000 +0200
-@@ -100,13 +100,13 @@
-        <p>If you want to install to a different directory, use:</p>
- 
-        <blockquote>
--          <p>make install DEST=&lt;directory&gt;</p>
-+          <p>make install DESTDIR=&lt;directory&gt;</p>
-        </blockquote>
- 
-        <p>For example:</p>
- 
-        <blockquote>
--         <p>make install DEST=/home/user/otherdir</p>
-+         <p>make install DESTDIR=/home/user/otherdir</p>
-        </blockquote>
- 
-        <p>Note that you must use full path for every file to be correctly
-diff -burNp eggdrop1.6.19/doc/html/readme.html eggdrop1.6.19.new/doc/html/readme.html
---- eggdrop1.6.19/doc/html/readme.html 2008-02-16 22:40:59.000000000 +0100
-+++ eggdrop1.6.19.new/doc/html/readme.html     2008-09-22 09:39:49.000000000 +0200
-@@ -261,7 +261,7 @@
-     <blockquote>
-       <p>If you followed <a href="install.html">Compilation and
-       Installation of Eggdrop</a> and did a &#39;make install&#39; (or
--      &#39;make install DEST=&quot;path&quot;&#39;) after &#39;make&#39;,
-+      &#39;make install DESTDIR=&quot;path&quot;&#39;) after &#39;make&#39;,
-       this will be pretty easy. Just upload the new eggdrop1.6.x.tar.gz file
-       to your home dir on your shell, gunzip and untar it, and type &#39;cd
-       ~/eggdrop1.6.x&#39;. Next, type &#39;./configure&#39;, &#39;make
-diff -burNp eggdrop1.6.19/doc/html/starting.html eggdrop1.6.19.new/doc/html/starting.html
---- eggdrop1.6.19/doc/html/starting.html       2008-02-16 22:40:59.000000000 +0100
-+++ eggdrop1.6.19.new/doc/html/starting.html   2008-09-22 09:42:21.000000000 +0200
-@@ -97,7 +97,7 @@
-     Eggdrop, you just have to do:</p>
- 
-     <blockquote>
--      <p><em>make DEST=&quot;directory&quot; install</em></p>
-+      <p><em>make DESTDIR=&quot;directory&quot; install</em></p>
-     </blockquote>
- 
-     <p>and it will copy all the necessary files.</p>
-diff -burNp eggdrop1.6.19/doc/Makefile.in eggdrop1.6.19.new/doc/Makefile.in
---- eggdrop1.6.19/doc/Makefile.in      2004-08-08 20:17:00.000000000 +0200
-+++ eggdrop1.6.19.new/doc/Makefile.in  2008-09-22 09:45:18.000000000 +0200
-@@ -34,39 +34,39 @@ clean:
-       @rm -f *~
- 
- install:
--      @if test ! -d $(DEST)/doc; then \
-+      @if test ! -d $(DESTDIR)/doc; then \
-               echo "Creating 'doc' subdirectory."; \
--              $(top_srcdir)/misc/mkinstalldirs $(DEST)/doc >/dev/null; \
-+              $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/doc >/dev/null; \
-       fi
--      @if test ! -d $(DEST)/doc/man1; then \
-+      @if test ! -d $(DESTDIR)/doc/man1; then \
-               echo "Creating 'doc/man1' subdirectory."; \
--              $(top_srcdir)/misc/mkinstalldirs $(DEST)/doc/man1 >/dev/null; \
-+              $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/doc/man1 >/dev/null; \
-       fi
--      @if test ! -d $(DEST)/doc/html; then \
-+      @if test ! -d $(DESTDIR)/doc/html; then \
-               echo "Creating 'doc/html' subdirectory."; \
--              $(top_srcdir)/misc/mkinstalldirs $(DEST)/doc/html >/dev/null; \
-+              $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/doc/html >/dev/null; \
-       fi
--      @if test ! -d $(DEST)/doc/settings; then \
-+      @if test ! -d $(DESTDIR)/doc/settings; then \
-               echo "Creating 'doc/settings' subdirectory."; \
--              $(top_srcdir)/misc/mkinstalldirs $(DEST)/doc/settings >/dev/null; \
-+              $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/doc/settings >/dev/null; \
-       fi
-       @echo "Copying docs."
-       @for i in $(DOCS); do \
--              $(INSTALL_DATA) $(srcdir)/$$i $(DEST)/doc/; \
-+              $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)/doc/; \
-       done
-       @for i in $(MAN1); do \
--              $(INSTALL_DATA) $(srcdir)/$$i $(DEST)/doc/man1/; \
-+              $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)/doc/man1/; \
-       done
-       @for i in $(SETTING_DOCS); do \
--              $(INSTALL_DATA) $(srcdir)/settings/$$i $(DEST)/doc/settings/; \
-+              $(INSTALL_DATA) $(srcdir)/settings/$$i $(DESTDIR)/doc/settings/; \
-       done
-       @if test "x`echo $(SETTING_MOD_DOCS)`" != "x$(SETTING_MOD_DOCS)"; then \
-               for i in `echo $(SETTING_MOD_DOCS)`; do \
--                      $(INSTALL_DATA) $$i $(DEST)/doc/settings/; \
-+                      $(INSTALL_DATA) $$i $(DESTDIR)/doc/settings/; \
-               done; \
-       fi
-       @if test "x`echo $(WEB_DOCS)`" != "x$(WEB_DOCS)"; then \
-               for i in `echo $(WEB_DOCS)`; do \
--                      $(INSTALL_DATA) $$i $(DEST)/doc/html/; \
-+                      $(INSTALL_DATA) $$i $(DESTDIR)/doc/html/; \
-               done; \
-       fi
-diff -burNp eggdrop1.6.19/eggdrop.conf eggdrop1.6.19.new/eggdrop.conf
---- eggdrop1.6.19/eggdrop.conf 2008-02-16 21:15:30.000000000 +0100
-+++ eggdrop1.6.19.new/eggdrop.conf     2008-09-22 09:52:43.000000000 +0200
+--- eggdrop1.6.21/eggdrop.conf~        2012-03-31 04:26:15.000000000 +0300
++++ eggdrop1.6.21/eggdrop.conf 2012-03-31 04:27:17.370702471 +0300
 @@ -1,4 +1,4 @@
 -#! /path/to/executable/eggdrop
 +#! /usr/bin/eggdrop
@@ -243,22 +42,22 @@ diff -burNp eggdrop1.6.19/eggdrop.conf eggdrop1.6.19.new/eggdrop.conf
  
  
  #### BLOWFISH MODULE ####
-@@ -1334,19 +1334,19 @@ loadmodule uptime
+@@ -1378,24 +1378,24 @@
  # directory. All scripts should be put there, although you can place them where
  # you like as long as you can supply a fully qualified path to them.
  #
 -# source scripts/script.tcl
-+# /usr/share/eggdrop/scripts/script.tcl
++# source /usr/share/eggdrop/scripts/script.tcl
  
 -source scripts/alltools.tcl
 -source scripts/action.fix.tcl
 +source /usr/share/eggdrop/scripts/alltools.tcl
 +source /usr/share/eggdrop/scripts/action.fix.tcl
  
- # Use this script for Tcl and Eggdrop backwards compatibility.
- # NOTE: This can also cause problems with some newer scripts.
--#source scripts/compat.tcl
-+source /usr/share/eggdrop/scripts/compat.tcl
+ # This script enhances Eggdrop's built-in dcc '.whois' command to allow all
+ # users to '.whois' their own handle.
+-source scripts/dccwhois.tcl
++source /usr/share/eggdrop/scripts/dccwhois.tcl
  
  # This script provides many useful informational functions, like setting
  # users' URLs, e-mail address, ICQ numbers, etc. You can modify it to add
@@ -267,303 +66,13 @@ diff -burNp eggdrop1.6.19/eggdrop.conf eggdrop1.6.19.new/eggdrop.conf
 +source /usr/share/eggdrop/scripts/userinfo.tcl
  loadhelp userinfo.help
  
- # A few IRC networks (EFnet and Undernet) have added some simple checks to
-diff -burNp eggdrop1.6.19/INSTALL eggdrop1.6.19.new/INSTALL
---- eggdrop1.6.19/INSTALL      2008-02-16 22:40:54.000000000 +0100
-+++ eggdrop1.6.19.new/INSTALL  2008-09-22 09:53:40.000000000 +0200
-@@ -66,11 +66,11 @@ Last revised: July 24, 2004
- 
-          If you want to install to a different directory, use:
- 
--           make install DEST=<directory>
-+           make install DESTDIR=<directory>
- 
-          For example:
- 
--           make install DEST=/home/user/otherdir
-+           make install DESTDIR=/home/user/otherdir
- 
-          Note that you must use full path for every file to be correctly
-          installed.
-diff -burNp eggdrop1.6.19/Makefile.in eggdrop1.6.19.new/Makefile.in
---- eggdrop1.6.19/Makefile.in  2004-08-28 08:43:21.000000000 +0200
-+++ eggdrop1.6.19.new/Makefile.in      2008-09-22 09:56:26.000000000 +0200
-@@ -11,7 +11,7 @@ VPATH = @srcdir@
- 
- @SET_MAKE@
- prefix = @prefix@
--DEST = @DEST@
-+DESTDIR = @DESTDIR@
- EGGEXEC = @EGGEXEC@
- EGGVERSION = @EGGVERSION@
- 
-@@ -119,7 +119,7 @@ MAKE_DEPEND = $(MAKE) 'MAKE=$(MAKE)' 'CC
- 
- MAKE_CONFIG = $(MAKE) 'MAKE=$(MAKE)'
- 
--MAKE_INSTALL = $(MAKE) 'MAKE=$(MAKE)' 'DEST=$(DEST)'
-+MAKE_INSTALL = $(MAKE) 'MAKE=$(MAKE)' 'DESTDIR=$(DESTDIR)'
- 
- all: @DEFAULT_MAKE@
- 
-@@ -308,109 +308,109 @@ install-start:
-               echo ""; \
-               exit 1; \
-       fi
--      @if test "x$(DEST)" = "x"; then \
-+      @if test "x$(DESTDIR)" = "x"; then \
-               echo "You must specify a destination directory."; \
-               echo "Example:"; \
-               echo ""; \
--              echo "  make install DEST=\"/home/wcc/mybot\""; \
-+              echo "  make install DESTDIR=\"/home/wcc/mybot\""; \
-               echo ""; \
-               exit 1; \
-       fi
-       @echo ""
-       @$(egg_test_run)
-       @echo ""
--      @echo "Installing in directory: '$(DEST)'."
-+      @echo "Installing in directory: '$(DESTDIR)'."
-       @echo ""
--      @if test ! -d $(DEST); then \
--              echo "Creating directory '$(DEST)'."; \
--              $(top_srcdir)/misc/mkinstalldirs $(DEST) >/dev/null; \
-+      @if test ! -d $(DESTDIR); then \
-+              echo "Creating directory '$(DESTDIR)'."; \
-+              $(top_srcdir)/misc/mkinstalldirs $(DESTDIR) >/dev/null; \
-       fi
- 
- install-bin:
--      @if test -f $(DEST)/o$(EGGEXEC); then \
--              rm -f $(DEST)/o$(EGGEXEC); \
-+      @if test -f $(DESTDIR)/o$(EGGEXEC); then \
-+              rm -f $(DESTDIR)/o$(EGGEXEC); \
-       fi
--      @if test -h $(DEST)/$(EGGEXEC); then \
-+      @if test -h $(DESTDIR)/$(EGGEXEC); then \
-               echo "Removing symlink to archival eggdrop binary."; \
--              rm -f $(DEST)/$(EGGEXEC); \
-+              rm -f $(DESTDIR)/$(EGGEXEC); \
-       fi
--      @if test -f $(DEST)/$(EGGEXEC); then \
-+      @if test -f $(DESTDIR)/$(EGGEXEC); then \
-               echo "Renaming old '$(EGGEXEC)' executable to 'o$(EGGEXEC)'."; \
--              mv -f $(DEST)/$(EGGEXEC) $(DEST)/o$(EGGEXEC); \
-+              mv -f $(DESTDIR)/$(EGGEXEC) $(DESTDIR)/o$(EGGEXEC); \
-       fi
-       @echo "Copying new '$(EGGEXEC)' executable and creating symlink."
--      @$(INSTALL_PROGRAM) $(EGGEXEC) $(DEST)/$(EGGEXEC)-$(EGGVERSION)
--      @(cd $(DEST) && $(LN_S) $(EGGEXEC)-$(EGGVERSION) $(EGGEXEC))
-+      @$(INSTALL_PROGRAM) $(EGGEXEC) $(DESTDIR)/$(EGGEXEC)-$(EGGVERSION)
-+      @(cd $(DESTDIR) && $(LN_S) $(EGGEXEC)-$(EGGVERSION) $(EGGEXEC))
- 
- install-modules:
--      @if test -h $(DEST)/modules; then \
-+      @if test -h $(DESTDIR)/modules; then \
-               echo "Removing symlink to archival modules subdirectory."; \
--              rm -f $(DEST)/modules; \
-+              rm -f $(DESTDIR)/modules; \
-       fi
--      @if test -d $(DEST)/modules; then \
-+      @if test -d $(DESTDIR)/modules; then \
-               echo "Moving old modules into 'modules.old' subdirectory."; \
--              rm -rf $(DEST)/modules.old; \
--              mv -f $(DEST)/modules $(DEST)/modules.old; \
-+              rm -rf $(DESTDIR)/modules.old; \
-+              mv -f $(DESTDIR)/modules $(DESTDIR)/modules.old; \
-       fi
-       @if test ! "x`echo *.$(MOD_EXT)`" = "x*.$(MOD_EXT)"; then \
--              if test ! -d $(DEST)/modules-$(EGGVERSION); then \
-+              if test ! -d $(DESTDIR)/modules-$(EGGVERSION); then \
-                       echo "Creating 'modules-$(EGGVERSION)' subdirectory and symlink."; \
--                      $(top_srcdir)/misc/mkinstalldirs $(DEST)/modules-$(EGGVERSION) >/dev/null; \
-+                      $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/modules-$(EGGVERSION) >/dev/null; \
-               fi; \
--              (cd $(DEST) && $(LN_S) modules-$(EGGVERSION) modules); \
-+              (cd $(DESTDIR) && $(LN_S) modules-$(EGGVERSION) modules); \
-               echo "Copying new modules."; \
-               for i in *.$(MOD_EXT); do \
--                      $(INSTALL_PROGRAM) $$i $(DEST)/modules-$(EGGVERSION)/; \
-+                      $(INSTALL_PROGRAM) $$i $(DESTDIR)/modules-$(EGGVERSION)/; \
-               done; \
-       fi
- 
- install-data:
--      @if test ! -f $(DEST)/eggdrop.conf; then \
--              $(INSTALL_DATA) $(srcdir)/eggdrop.conf $(DEST)/; \
-+      @if test ! -f $(DESTDIR)/eggdrop.conf; then \
-+              $(INSTALL_DATA) $(srcdir)/eggdrop.conf $(DESTDIR)/; \
-       fi
--      @if test ! -d $(DEST)/logs; then \
-+      @if test ! -d $(DESTDIR)/logs; then \
-               echo "Creating 'logs' subdirectory."; \
--              $(top_srcdir)/misc/mkinstalldirs $(DEST)/logs >/dev/null; \
--              $(INSTALL_DATA) $(srcdir)/logs/CONTENTS $(DEST)/logs/; \
-+              $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/logs >/dev/null; \
-+              $(INSTALL_DATA) $(srcdir)/logs/CONTENTS $(DESTDIR)/logs/; \
-       fi;
--      @if test ! -d $(DEST)/text; then \
-+      @if test ! -d $(DESTDIR)/text; then \
-               echo "Creating 'text' subdirectory."; \
--              $(top_srcdir)/misc/mkinstalldirs $(DEST)/text >/dev/null; \
-+              $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/text >/dev/null; \
-       fi;
--      @if test ! -f $(DEST)/text/motd; then \
--              $(INSTALL_DATA) $(srcdir)/text/motd $(DEST)/text/; \
-+      @if test ! -f $(DESTDIR)/text/motd; then \
-+              $(INSTALL_DATA) $(srcdir)/text/motd $(DESTDIR)/text/; \
-       fi
--      @if test ! -f $(DEST)/text/banner; then \
--              $(INSTALL_DATA) $(srcdir)/text/banner $(DEST)/text/; \
-+      @if test ! -f $(DESTDIR)/text/banner; then \
-+              $(INSTALL_DATA) $(srcdir)/text/banner $(DESTDIR)/text/; \
-       fi
- 
- install-help:
-       @echo "Copying help files."
-       @if test ! "x`echo $(srcdir)/help/*.help`" = "x$(srcdir)/help/*.help"; then \
--              if test ! -d $(DEST)/help; then \
-+              if test ! -d $(DESTDIR)/help; then \
-                       echo "Creating 'help' subdirectory."; \
--                      $(top_srcdir)/misc/mkinstalldirs $(DEST)/help >/dev/null; \
-+                      $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/help >/dev/null; \
-               fi; \
-               for i in $(srcdir)/help/*.help; do \
--                      $(INSTALL_DATA) $$i $(DEST)/help/; \
-+                      $(INSTALL_DATA) $$i $(DESTDIR)/help/; \
-               done; \
-       fi
-       @if test ! "x`echo $(srcdir)/help/msg/*.help`" = "x$(srcdir)/help/msg/*.help"; then \
--              if test ! -d $(DEST)/help/msg; then \
-+              if test ! -d $(DESTDIR)/help/msg; then \
-                       echo "Creating 'help/msg' subdirectory."; \
--                      $(top_srcdir)/misc/mkinstalldirs $(DEST)/help/msg >/dev/null; \
-+                      $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/help/msg >/dev/null; \
-               fi; \
-               for i in $(srcdir)/help/msg/*.help; do \
--                      $(INSTALL_DATA) $$i $(DEST)/help/msg/; \
-+                      $(INSTALL_DATA) $$i $(DESTDIR)/help/msg/; \
-               done; \
-       fi
-       @if test ! "x`echo $(srcdir)/help/set/*.help`" = "x$(srcdir)/help/set/*.help"; then \
--              if test ! -d $(DEST)/help/set; then \
-+              if test ! -d $(DESTDIR)/help/set; then \
-                       echo "Creating 'help/set' subdirectory."; \
--                      $(top_srcdir)/misc/mkinstalldirs $(DEST)/help/set >/dev/null; \
-+                      $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/help/set >/dev/null; \
-               fi; \
-               for i in $(srcdir)/help/set/*.help; do \
--                      $(INSTALL_DATA) $$i $(DEST)/help/set/; \
-+                      $(INSTALL_DATA) $$i $(DESTDIR)/help/set/; \
-               done; \
-       fi
-       @cd src/mod/ && $(MAKE_INSTALL) install-help
-@@ -418,25 +418,25 @@ install-help:
- install-language:
-       @echo "Copying language files."
-       @if test ! "x`echo $(srcdir)/language/*.lang`" = "x$(srcdir)/language/*.lang"; then \
--              if test ! -d $(DEST)/language; then \
-+              if test ! -d $(DESTDIR)/language; then \
-                       echo "Creating 'language' subdirectory."; \
--                      $(top_srcdir)/misc/mkinstalldirs $(DEST)/language >/dev/null; \
-+                      $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/language >/dev/null; \
-               fi; \
-               for i in $(srcdir)/language/*.lang; do \
--                      $(INSTALL_DATA) $$i $(DEST)/language/; \
-+                      $(INSTALL_DATA) $$i $(DESTDIR)/language/; \
-               done; \
-       fi
-       @cd src/mod && $(MAKE_INSTALL) install-language
- 
- install-filesys:
--      @if test ! -d $(DEST)/filesys; then \
-+      @if test ! -d $(DESTDIR)/filesys; then \
-               echo "Creating skeletal filesystem subdirectories."; \
--              $(top_srcdir)/misc/mkinstalldirs $(DEST)/filesys >/dev/null; \
--              $(top_srcdir)/misc/mkinstalldirs $(DEST)/filesys/incoming >/dev/null; \
-+              $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/filesys >/dev/null; \
-+              $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/filesys/incoming >/dev/null; \
-       fi
- 
- install-doc:
--      @$(INSTALL_DATA) $(srcdir)/README $(DEST)
-+      @$(INSTALL_DATA) $(srcdir)/README $(DESTDIR)
-       @cd doc/ && $(MAKE_INSTALL) install
- 
- install-scripts:
-@@ -449,7 +449,7 @@ install-end:
-       @echo "You MUST ensure that you edit/verify your configuration file."
-       @echo "An example configuration file, eggdrop.conf, is distributed with Eggdrop."
-       @echo ""
--      @echo "Remember to change directory to $(DEST) before you proceed."
-+      @echo "Remember to change directory to $(DESTDIR) before you proceed."
-       @echo ""
- 
- #safety hash
-diff -burNp eggdrop1.6.19/scripts/Makefile.in eggdrop1.6.19.new/scripts/Makefile.in
---- eggdrop1.6.19/scripts/Makefile.in  2008-02-16 07:00:17.000000000 +0100
-+++ eggdrop1.6.19.new/scripts/Makefile.in      2008-09-22 09:58:28.000000000 +0200
-@@ -32,44 +32,44 @@ clean:
-       @rm -f *~
+ # Use this script for Tcl and Eggdrop backwards compatibility.
+ # NOTE: This can also cause problems with some newer scripts.
+-#source scripts/compat.tcl
++#source /usr/share/eggdrop/scripts/compat.tcl
  
- install:
--      @if test ! -d $(DEST)/scripts; then \
-+      @if test ! -d $(DESTDIR)/scripts; then \
-               echo "Creating 'scripts' subdirectory."; \
--              $(top_srcdir)/misc/mkinstalldirs $(DEST)/scripts >/dev/null; \
-+              $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/scripts >/dev/null; \
-               echo "Copying scripts."; \
-               for i in $(DOCS); do \
--                      $(INSTALL_DATA) $(srcdir)/$$i $(DEST)/scripts/; \
-+                      $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)/scripts/; \
-               done; \
-               for i in $(SCRIPTS); do \
--                      $(INSTALL_DATA) $(srcdir)/$$i $(DEST)/scripts/; \
-+                      $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)/scripts/; \
-               done; \
-               for i in $(EXESCRIPTS); do \
--                      $(INSTALL_SCRIPT) $(srcdir)/$$i $(DEST)/scripts/; \
-+                      $(INSTALL_SCRIPT) $(srcdir)/$$i $(DESTDIR)/scripts/; \
-               done; \
-               if test ! "x`echo $(srcdir)/help/*.help`" = "x$(srcdir)/help/*.help"; then \
--                      if test ! -d $(DEST)/help; then \
-+                      if test ! -d $(DESTDIR)/help; then \
-                               echo "Creating 'help' subdirectory."; \
--                              $(top_srcdir)/misc/mkinstalldirs $(DEST)/help >/dev/null; \
-+                              $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/help >/dev/null; \
-                       fi; \
-                       for i in $(srcdir)/help/*.help; do \
--                              $(INSTALL_DATA) $$i $(DEST)/help/; \
-+                              $(INSTALL_DATA) $$i $(DESTDIR)/help/; \
-                       done; \
-               fi; \
-               if test ! "x`echo $(srcdir)/help/msg/*.help`" = "x$(srcdir)/help/msg/*.help"; then \
--                      if test ! -d $(DEST)/help/msg; then \
-+                      if test ! -d $(DESTDIR)/help/msg; then \
-                               echo "Creating 'help/msg' subdirectory."; \
--                              $(top_srcdir)/misc/mkinstalldirs $(DEST)/help/msg >/dev/null; \
-+                              $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/help/msg >/dev/null; \
-                       fi; \
-                       for i in $(srcdir)/help/msg/*.help; do \
--                              $(INSTALL_DATA) $$i $(DEST)/help/msg/; \
-+                              $(INSTALL_DATA) $$i $(DESTDIR)/help/msg/; \
-                       done; \
-               fi; \
-               if test ! "x`echo $(srcdir)/help/set/*.help`" = "x$(srcdir)/help/set/*.help"; then \
--                      if test ! -d $(DEST)/help/set; then \
-+                      if test ! -d $(DESTDIR)/help/set; then \
-                               echo "Creating 'help/set' subdirectory."; \
--                              $(top_srcdir)/misc/mkinstalldirs $(DEST)/help/set >/dev/null; \
-+                              $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/help/set >/dev/null; \
-                       fi; \
-                       for i in $(srcdir)/help/set/*.help; do \
--                              $(INSTALL_DATA) $$i $(DEST)/help/set/; \
-+                              $(INSTALL_DATA) $$i $(DESTDIR)/help/set/; \
-                       done; \
-               fi; \
-       fi
-diff -burNp eggdrop1.6.19/src/eggdrop.h eggdrop1.6.19.new/src/eggdrop.h
+ # A few IRC networks (EFnet and Undernet) have added some simple checks to
+ # prevent drones from connecting to the IRC network. While these checks are
 --- eggdrop1.6.19/src/eggdrop.h        2008-02-16 22:41:03.000000000 +0100
 +++ eggdrop1.6.19.new/src/eggdrop.h    2008-09-22 10:00:48.000000000 +0200
 @@ -75,7 +75,7 @@
@@ -575,73 +84,6 @@ diff -burNp eggdrop1.6.19/src/eggdrop.h eggdrop1.6.19.new/src/eggdrop.h
  #define BASELANG "english"    /* language which always gets loaded before
                                   all other languages. You do not want to
                                   change this.                              */
-diff -burNp eggdrop1.6.19/src/mod/Makefile.in eggdrop1.6.19.new/src/mod/Makefile.in
---- eggdrop1.6.19/src/mod/Makefile.in  2004-08-28 08:43:22.000000000 +0200
-+++ eggdrop1.6.19.new/src/mod/Makefile.in      2008-09-22 10:02:45.000000000 +0200
-@@ -123,50 +123,50 @@ install: install-help install-language
- 
- install-help:
-       @echo "Copying module help files."
--      @if test ! -d $(DEST)/help; then \
-+      @if test ! -d $(DESTDIR)/help; then \
-               echo "Creating 'help' subdirectory."; \
--              $(top_srcdir)/misc/mkinstalldirs $(DEST)/help >/dev/null; \
-+              $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/help >/dev/null; \
-       fi; \
-       for i in $(mods); do \
-               if test ! "x`echo $(srcdir)/$$i/help/*.help`" = "x$(srcdir)/$$i/help/*.help"; then \
-                       for h in $(srcdir)/$$i/help/*.help; do \
--                              $(INSTALL_DATA) $$h $(DEST)/help/; \
-+                              $(INSTALL_DATA) $$h $(DESTDIR)/help/; \
-                       done; \
-               fi; \
-       done;
--      @if test ! -d $(DEST)/help/msg; then \
-+      @if test ! -d $(DESTDIR)/help/msg; then \
-               echo "Creating 'help/msg' subdirectory."; \
--              $(top_srcdir)/misc/mkinstalldirs $(DEST)/help/msg >/dev/null; \
-+              $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/help/msg >/dev/null; \
-       fi; \
-       for i in $(mods); do \
-               if test ! "x`echo $(srcdir)/$$i/help/msg/*.help`" = "x$(srcdir)/$$i/help/msg/*.help"; then \
-                       for h in $(srcdir)/$$i/help/msg/*.help; do \
--                              $(INSTALL_DATA) $$h $(DEST)/help/msg/; \
-+                              $(INSTALL_DATA) $$h $(DESTDIR)/help/msg/; \
-                       done; \
-               fi; \
-       done;
--      @if test ! -d $(DEST)/help/set; then \
-+      @if test ! -d $(DESTDIR)/help/set; then \
-               echo "Creating 'help/set' subdirectory."; \
--              $(top_srcdir)/misc/mkinstalldirs $(DEST)/help/set >/dev/null; \
-+              $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/help/set >/dev/null; \
-       fi; \
-       for i in $(mods); do \
-               if test ! "x`echo $(srcdir)/$$i/help/set/*.help`" = "x$(srcdir)/$$i/help/set/*.help"; then \
-                       for h in $(srcdir)/$$i/help/set/*.help; do \
--                              $(INSTALL_DATA) $$h $(DEST)/help/set/; \
-+                              $(INSTALL_DATA) $$h $(DESTDIR)/help/set/; \
-                       done; \
-               fi; \
-       done;
- 
- install-language:
-       @echo "Copying module language files."
--      @if test ! -d $(DEST)/language; then \
-+      @if test ! -d $(DESTDIR)/language; then \
-               echo "Creating 'language' subdirectory."; \
--              $(top_srcdir)/misc/mkinstalldirs $(DEST)/language >/dev/null; \
-+              $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/language >/dev/null; \
-       fi; \
-       for i in $(mods); do \
-               if test ! "x`echo $(srcdir)/$$i/language/*.lang`" = "x$(srcdir)/$$i/language/*.lang"; then \
-                       for h in $(srcdir)/$$i/language/*.lang; do \
--                              $(INSTALL_DATA) $$h $(DEST)/language/; \
-+                              $(INSTALL_DATA) $$h $(DESTDIR)/language/; \
-                       done; \
-               fi; \
-       done;
-diff -burNp eggdrop1.6.19/eggdrop.conf eggdrop1.6.19-new/eggdrop.conf
 --- eggdrop1.6.19/eggdrop.conf 2008-02-16 21:15:30.000000000 +0100
 +++ eggdrop1.6.19-new/eggdrop.conf     2008-09-23 19:10:36.435603076 +0200
 @@ -1359,11 +1359,11 @@ if {[info exists net-type]} {

diff --git a/eggdrop-doc_makefile.patch b/eggdrop-doc_makefile.patch
index 4afccc8ca924448bde480c51c334593bbf53e880..00381016e900f83389f5cf948f98cd79d8f4aa82 100644 (file)
--- a/eggdrop-doc_makefile.patch
+++ b/eggdrop-doc_makefile.patch
@@ -1,28 +1,28 @@
---- doc/Makefile.in    2004-10-18 00:23:49.173141992 +0200
-+++ doc/Makefile.in    2004-10-18 00:30:44.751964408 +0200
+--- eggdrop1.6.21/doc/Makefile.in~     2012-03-31 04:32:33.000000000 +0300
++++ eggdrop1.6.21/doc/Makefile.in      2012-03-31 04:32:58.536425562 +0300
 @@ -14,7 +14,8 @@
  
- DOCS = ABOUT AUTHORS BANS BOTNET BUG-REPORT COMPILE-GUIDE CONTENTS \
- FIRST-SCRIPT KNOWN-PROBLEMS MODULES PARTYLINE PATCH-HOWTO tcl-commands.doc \
--TEXT-SUBSTITUTIONS TRICKS UPDATES1.6 USERS
-+TEXT-SUBSTITUTIONS TRICKS UPDATES1.6 USERS \
+ DOCS = ABOUT BANS BOTNET BUG-REPORT COMPILE-GUIDE CONTENTS \
+ Changes1.6 FIRST-SCRIPT KNOWN-PROBLEMS MODULES PARTYLINE PATCH-HOWTO \
+-TEXT-SUBSTITUTIONS TRICKS USERS Versions WEIRD-MESSAGES tcl-commands.doc
++TEXT-SUBSTITUTIONS TRICKS USERS Versions WEIRD-MESSAGES tcl-commands.doc \
 +LANGUAGE.finnish LANGUAGE.portuguese LANGUAGE.portuguese.br
  
  MAN1 = man1/eggdrop.1
  
 @@ -50,6 +51,10 @@
                echo "Creating 'doc/settings' subdirectory."; \
-               $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/doc/settings >/dev/null; \
+               $(top_srcdir)/misc/mkinstalldirs $(DEST)/doc/settings >/dev/null; \
        fi
-+      @if test ! -d $(DESTDIR)/doc/modules; then \
++      @if test ! -d $(DEST)/doc/modules; then \
 +              echo "Creating 'doc/modules' subdirectory."; \
-+              $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/doc/modules >/dev/null; \
++              $(top_srcdir)/misc/mkinstalldirs $(DEST)/doc/modules >/dev/null; \
 +      fi
        @echo "Copying docs."
        @for i in $(DOCS); do \
-               $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)/doc/; \
+               $(INSTALL_DATA) $(srcdir)/$$i $(DEST)/doc/; \
 @@ -70,3 +75,4 @@
-                       $(INSTALL_DATA) $$i $(DESTDIR)/doc/html/; \
+                       $(INSTALL_DATA) $$i $(DEST)/doc/html/; \
                done; \
        fi
-+      @cp -r $(srcdir)/modules/* $(DESTDIR)/doc/modules
++      @cp -pr $(srcdir)/modules/* $(DEST)/doc/modules

diff --git a/eggdrop-nolibs.patch b/eggdrop-nolibs.patch
index 90880f90ecf72e3de5a54498ec6189a018851b30..7a3dc59ca3a7b338f9fc3be6792b6843769f2a5e 100644 (file)
--- a/eggdrop-nolibs.patch
+++ b/eggdrop-nolibs.patch
@@ -1,6 +1,6 @@
-diff -burN eggdrop1.6.17.orig/aclocal.m4 eggdrop1.6.17/aclocal.m4
---- eggdrop1.6.17.orig/aclocal.m4      2004-10-18 00:15:56.783956064 +0200
-+++ eggdrop1.6.17/aclocal.m4   2004-10-18 00:38:40.107699352 +0200
+diff -burN eggdrop1.6.17.orig/acinclude.m4 eggdrop1.6.17/acinclude.m4
+--- eggdrop1.6.17.orig/acinclude.m4    2004-10-18 00:15:56.783956064 +0200
++++ eggdrop1.6.17/acinclude.m4 2004-10-18 00:38:40.107699352 +0200
 @@ -757,9 +757,9 @@
    if test "$IRIX" = "yes"; then
      AC_MSG_WARN([Skipping library tests because they CONFUSE IRIX.])

diff --git a/eggdrop-topicprot.patch b/eggdrop-topicprot.patch
index 789a48a73e64cb823428e2eafcad383cafc5438b..f82fde0bf6a58d1c4c4d0dba4ae12518852acf43 100644 (file)
--- a/eggdrop-topicprot.patch
+++ b/eggdrop-topicprot.patch
@@ -37,9 +37,8 @@ diff -burNp eggdrop1.6.19/src/chanprog.c eggdrop1.6.19.new/src/chanprog.c
 +  }
 +}
 +
-diff -burNp eggdrop1.6.19/src/mod/channels.mod/channels.c eggdrop1.6.19.new/src/mod/channels.mod/channels.c
---- eggdrop1.6.19/src/mod/channels.mod/channels.c      2008-02-16 22:41:06.000000000 +0100
-+++ eggdrop1.6.19.new/src/mod/channels.mod/channels.c  2008-09-22 11:34:55.161533902 +0200
+--- eggdrop1.6.21/src/mod/channels.mod/channels.c~     2012-03-31 04:33:59.000000000 +0300
++++ eggdrop1.6.21/src/mod/channels.mod/channels.c      2012-03-31 04:34:36.050919651 +0300
 @@ -385,6 +385,7 @@ static void write_channels()
    FILE *f;
    char s[121], w[1024], w2[1024], name[163];
@@ -56,25 +55,24 @@ diff -burNp eggdrop1.6.19/src/mod/channels.mod/channels.c eggdrop1.6.19.new/src/
      convert_element(chan->need_op, need1);
      convert_element(chan->need_invite, need2);
      convert_element(chan->need_key, need3);
-@@ -412,7 +414,7 @@ static void write_channels()
+@@ -417,7 +417,7 @@
+     convert_element(chan->need_unban, need4);
      convert_element(chan->need_limit, need5);
-     /* Do not indent me (adds extra spaces to chan file). */
      fprintf(f,
--"channel %s %s%schanmode %s idle-kick %d stopnethack-mode %d revenge-mode %d \
-+"channel %s %s%schanmode %s topic %s idle-kick %d stopnethack-mode %d revenge-mode %d \
- need-op %s need-invite %s need-key %s need-unban %s need-limit %s \
- flood-chan %d:%d flood-ctcp %d:%d flood-join %d:%d flood-kick %d:%d \
- flood-deop %d:%d flood-nick %d:%d aop-delay %d:%d ban-time %d exempt-time %d \
-@@ -422,7 +424,7 @@ invite-time %d %cenforcebans %cdynamicba
- %cseen %cinactive %cdynamicexempts %cuserexempts %cdynamicinvites \
- %cuserinvites %cnodesynch ",
-             channel_static(chan) ? "set" : "add", name, channel_static(chan) ?
--            " " : " { ", w2, chan->idle_kick, chan->stopnethack_mode,
-+          " " : " { ", w2, topic, chan->idle_kick, chan->stopnethack_mode,
+-            "channel add %s { chanmode %s idle-kick %d stopnethack-mode %d "
++            "channel add %s { chanmode %s idle-kick topic %d stopnethack-mode %d "
+             "revenge-mode %d need-op %s need-invite %s need-key %s "
+             "need-unban %s need-limit %s flood-chan %d:%d flood-ctcp %d:%d "
+             "flood-join %d:%d flood-kick %d:%d flood-deop %d:%d "
+@@ -428,7 +428,7 @@
+             "%crevenge %crevengebot %cautovoice %csecret %cshared %ccycle "
+             "%cseen %cinactive %cdynamicexempts %cuserexempts %cdynamicinvites "
+             "%cuserinvites %cnodesynch %cstatic }" "\n",
+-            name, w2, chan->idle_kick, chan->stopnethack_mode,
++            name, w2, topic, chan->idle_kick, chan->stopnethack_mode,
              chan->revenge_mode, need1, need2, need3, need4, need5,
              chan->flood_pub_thr, chan->flood_pub_time,
              chan->flood_ctcp_thr, chan->flood_ctcp_time,
-diff -burNp eggdrop1.6.19/src/mod/channels.mod/cmdschan.c eggdrop1.6.19.new/src/mod/channels.mod/cmdschan.c
 --- eggdrop1.6.19/src/mod/channels.mod/cmdschan.c      2008-02-16 22:41:07.000000000 +0100
 +++ eggdrop1.6.19.new/src/mod/channels.mod/cmdschan.c  2008-09-22 11:37:38.571477034 +0200
 @@ -1269,6 +1269,7 @@ static void cmd_chaninfo(struct userrec 

diff --git a/eggdrop.spec b/eggdrop.spec
index a5939fe4114543f05d0010e5a3910bd01fe562e8..c34abcd331f9d1e039e3166c916f4bc43791bb76 100644 (file)
--- a/eggdrop.spec
+++ b/eggdrop.spec
@@ -1,18 +1,19 @@
 #
 # Conditional build:
 %bcond_with    suzi    # encoding enhancements
+%bcond_without ssl             # openssl patch
 #
 Summary:       Eggdrop is an IRC bot, written in C
 Summary(pl.UTF-8):     Eggdrop jest botem IRC napisanym w C
 Summary(pt_BR.UTF-8):  Bot de IRC escrito em C
 Summary(ru.UTF-8):     Eggdrop, это IRC-бот написанный на языке C.
 Name:          eggdrop
-Version:       1.6.19
-Release:       6
+Version:       1.6.21
+Release:       0.3
 License:       GPL v2
 Group:         Applications/Communications
 Source0:       ftp://ftp.eggheads.org/pub/eggdrop/source/1.6/%{name}%{version}.tar.bz2
-# Source0-md5: b706bbe4fdd05964e0ea0cd920f28539
+# Source0-md5: 5663b2daecc790e6e9237e1d5a2caa50
 # In order to unify filenames, following language packs and third-party modules were
 # repackaged. Some files were renamed, but none modified. Original archives can be
 # found by looking at http://www.egghelp.org/
@@ -67,7 +68,7 @@ Patch10:      %{name}-ipv6-ssl.patch
 URL:           http://www.eggheads.org/
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: openssl-devel >= 0.9.7d
+%{?with_ssl:BuildRequires:     openssl-devel >= 0.9.7d}
 BuildRequires: tcl-devel
 Requires:      tcl
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -151,8 +152,9 @@ Eggdrop находится на канале в целях оказания за
 
 %prep
 %setup -q -n %{name}%{version} -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a20 -a21 -a22 -a23 -a24 -a25 -a26 -a27 -a28 -a30
+mv aclocal.m4 acinclude.m4
 %patch0 -p1
-%patch1 -p0
+%patch1 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
@@ -163,17 +165,16 @@ Eggdrop находится на канале в целях оказания за
 patch -p1 < eggdrop1.6.19-sp.0009.diff || exit 1
 %else
 %patch2 -p1
-%patch6 -p1
+%{?with_ssl:%patch6 -p1}
 %endif
 
-%patch9 -p0
-%patch10 -p0
+#%patch9 -p0 - wtf is this?
+%{?with_ssl:%patch10 -p1}
 
-%build
 # detect threaded tcl version
-sed -i -e 's#TclpFinalizeThreadData#Tcl_FinalizeThread#g' aclocal.m4
+sed -i -e 's#TclpFinalizeThreadData#Tcl_FinalizeThread#g' acinclude.m4
 
-mv aclocal.m4 acinclude.m4
+%build
 cp -f /usr/share/automake/config.sub misc/
 cp -f %{name}.conf doc/%{name}.conf.example
 %{__aclocal}
@@ -197,7 +198,8 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir}/%{name}/modules,%{_mandir}/man1,%{_datadir}/%{name}}
 
 %{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT
+       INSTALL="install -p" \
+       DEST=$RPM_BUILD_ROOT
 
 mv $RPM_BUILD_ROOT/%{name}-%{version} $RPM_BUILD_ROOT%{_bindir}/%{name}
 mv $RPM_BUILD_ROOT{/{text/*,help,scripts,language},%{_datadir}/%{name}/}