OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [email protected] Module: openpkg-src Date: 23-Apr-2009 15:00:06 Branch: HEAD Handle: 2009042314000400 Modified files: openpkg-src/ratbox ratbox.patch ratbox.spec Log: modifying package: ratbox-2.2.8 20080112 -> 20090423 Summary: Revision Changes Path 1.32 +24 -33 openpkg-src/ratbox/ratbox.patch 1.58 +17 -6 openpkg-src/ratbox/ratbox.spec ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/ratbox/ratbox.patch ============================================================================ $ cvs diff -u -r1.31 -r1.32 ratbox.patch --- openpkg-src/ratbox/ratbox.patch 24 Jul 2007 15:01:00 -0000 1.31 +++ openpkg-src/ratbox/ratbox.patch 23 Apr 2009 13:00:04 -0000 1.32 @@ -10,39 +10,9 @@ echo "$as_me:$LINENO: checking for OpenSSL" >&5 echo $ECHO_N "checking for OpenSSL... $ECHO_C" >&6 -Index: ratbox-services-1.1.2/configure ---- ratbox-services-1.1.2/configure.orig 2006-07-17 20:17:32 +0200 -+++ ratbox-services-1.1.2/configure 2007-02-27 08:29:19 +0100 -@@ -2464,7 +2464,7 @@ - - echo $ac_n "checking for -lsqlite3 in given path""... $ac_c" 1>&6 - echo "configure:2467: checking for -lsqlite3 in given path" >&5 -- if test -e "$ac_cv_sqlite3_path/lib/libsqlite3.so"; then -+ if test -f "$ac_cv_sqlite3_path/lib/libsqlite3.a"; then - echo "$ac_t""yes" 1>&6 - ac_cv_found_sqlite3_lib="yes" - else -@@ -2571,7 +2571,7 @@ - - echo $ac_n "checking for -lmysqlclient in given path""... $ac_c" 1>&6 - echo "configure:2574: checking for -lmysqlclient in given path" >&5 -- if test -e "$ac_cv_mysql_path/lib/libmysqlclient.so"; then -+ if test -f "$ac_cv_mysql_path/lib/libmysqlclient.a"; then - echo "$ac_t""yes" 1>&6 - ac_cv_found_mysql_lib="yes" - else -@@ -2734,7 +2734,7 @@ - - echo $ac_n "checking for -lpq in given path""... $ac_c" 1>&6 - echo "configure:2737: checking for -lpq in given path" >&5 -- if test -e "$ac_cv_pgsql_path/lib/libpq.so"; then -+ if test -f "$ac_cv_pgsql_path/lib/libpq.a"; then - echo "$ac_t""yes" 1>&6 - ac_cv_found_pgsql_lib="yes" - else -Index: ratbox-services-1.1.2/include/config.h ---- ratbox-services-1.1.2/include/config.h.orig 2007-02-26 19:41:30 +0100 -+++ ratbox-services-1.1.2/include/config.h 2007-02-27 08:29:19 +0100 +Index: ratbox-services-1.2.1/include/config.h +--- ratbox-services-1.2.1/include/config.h.orig 2008-05-20 21:11:01 +0200 ++++ ratbox-services-1.2.1/include/config.h 2008-05-21 20:27:53 +0200 @@ -9,7 +9,7 @@ #define PID_PATH RUNDIR "/ratbox-services.pid" #define LOG_PATH LOGDIR "/ratbox-services.log" @@ -52,3 +22,24 @@ /* SMALL_NETWORK * If your network is fairly small, enable this to save some memory. +Index: ratbox-services-1.2.1/configure +--- ratbox-services-1.2.1/configure.orig 2008-06-27 19:56:02 +0200 ++++ ratbox-services-1.2.1/configure 2008-06-29 10:24:44 +0200 +@@ -5595,7 +5595,7 @@ + + { echo "$as_me:$LINENO: checking for -lsqlite3 in given path" >&5 + echo $ECHO_N "checking for -lsqlite3 in given path... $ECHO_C" >&6; } +- if test -e "$ac_cv_sqlite3_path/lib/libsqlite3.so"; then ++ if test -e "$ac_cv_sqlite3_path/lib/libsqlite3.a"; then + { echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6; } + ac_cv_found_sqlite3_lib="yes" +@@ -6316,7 +6316,7 @@ + # Ultrix sh set writes to stderr and can't be redirected directly, + # and sets the high bit in the cache file unless we assign to the vars. + ( +- for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do ++ for ac_var in `set 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) @@ . patch -p0 <<'@@ .' Index: openpkg-src/ratbox/ratbox.spec ============================================================================ $ cvs diff -u -r1.57 -r1.58 ratbox.spec --- openpkg-src/ratbox/ratbox.spec 18 Apr 2009 13:14:43 -0000 1.57 +++ openpkg-src/ratbox/ratbox.spec 23 Apr 2009 13:00:04 -0000 1.58 @@ -23,7 +23,7 @@ # package version %define V_server 2.2.8 -%define V_services 1.1.2 +%define V_services 1.2.1 %define V_respond 1.0 # package information @@ -37,7 +37,7 @@ Group: InstantMessaging License: GPL Version: %{V_server} -Release: 20080112 +Release: 20090423 # list of sources Source0: ftp://ftp.ircd-ratbox.org/pub/ircd-ratbox/ircd-ratbox-%{V_server}.tgz @@ -104,7 +104,7 @@ --prefix=%{l_prefix} \ --with-confdir=%{l_prefix}/etc/ratbox \ --with-logdir=%{l_prefix}/var/ratbox \ - --with-helpdir=%{l_prefix}/share/ratbox \ + --with-helpdir=%{l_prefix}/share/ratbox/help \ --with-moduledir=%{l_prefix}/libexec/ratbox \ --enable-openssl=%{l_prefix} \ --enable-zlib \ @@ -140,7 +140,8 @@ --sysconfdir=%{l_prefix}/etc/ratbox \ --with-logdir=%{l_prefix}/var/ratbox \ --with-rundir=%{l_prefix}/var/ratbox \ - --with-helpdir=%{l_prefix}/share/ratbox/services \ + --with-helpdir=%{l_prefix}/share/ratbox/services/help \ + --with-langdir=%{l_prefix}/share/ratbox/services/lang \ --enable-sqlite3=%{l_prefix} %{l_make} %{l_mflags} ) || exit $? @@ -195,6 +196,7 @@ $RPM_BUILD_ROOT%{l_prefix}/share/ratbox/etc mv $RPM_BUILD_ROOT%{l_prefix}/etc/ratbox/example.conf \ $RPM_BUILD_ROOT%{l_prefix}/share/ratbox/etc/server.conf.sample + rm -rf $RPM_BUILD_ROOT%{l_prefix}/include ) || exit $? # install IRC services @@ -206,6 +208,16 @@ $RPM_BUILD_ROOT%{l_prefix}/share/ratbox/etc/services.conf.sample %{l_shtool} install -c -m 644 \ tools/base/schema-sqlite.txt $RPM_BUILD_ROOT%{l_prefix}/share/ratbox/services/ + mv $RPM_BUILD_ROOT%{l_prefix}/bin/dbupgrade.pl \ + $RPM_BUILD_ROOT%{l_prefix}/bin/ratbox-dbupgrade + mv $RPM_BUILD_ROOT%{l_prefix}/bin/definetolength.pl \ + $RPM_BUILD_ROOT%{l_prefix}/bin/ratbox-definetolength + mv $RPM_BUILD_ROOT%{l_prefix}/bin/ircd-shortcut.pl \ + $RPM_BUILD_ROOT%{l_prefix}/bin/ratbox-ircd-shortcut + rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/ratbox/services/help/ru + rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/ratbox/services/help/bg + rm -f $RPM_BUILD_ROOT%{l_prefix}/share/ratbox/services/lang/ru.lang + rm -f $RPM_BUILD_ROOT%{l_prefix}/share/ratbox/services/lang/bg.lang ) || exit $? # install IRC challenge/response client @@ -217,8 +229,7 @@ ) || exit $? # post-adjust installation - rmdir $RPM_BUILD_ROOT%{l_prefix}/libexec/ratbox-old - rmdir $RPM_BUILD_ROOT%{l_prefix}/share/ratbox-old + find $RPM_BUILD_ROOT%{l_prefix} -type d -name "*-old" -print | xargs rmdir >/dev/null 2>&1 || true strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true chmod 755 $RPM_BUILD_ROOT%{l_prefix}/bin/* chmod 644 $RPM_BUILD_ROOT%{l_prefix}/etc/ratbox/* @@ . ______________________________________________________________________ OpenPKG http://openpkg.org CVS Repository Commit List [email protected]
