rpms/thebridge/devel thebridge-1.06-zlib.patch, NONE, 1.1 thebridge.init, NONE, 1.1 thebridge.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Sun Dec 7 14:54:35 UTC 2008

Author: lucilanga

Update of /cvs/pkgs/rpms/thebridge/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15156

Modified Files:
	.cvsignore sources 
Added Files:
	thebridge-1.06-zlib.patch thebridge.init thebridge.spec 
Log Message:
initial import

thebridge-1.06-zlib.patch:

--- NEW FILE thebridge-1.06-zlib.patch ---
diff -Naur thebridge-1.06/configure thebridge-1.06-mod/configure
--- thebridge-1.06/configure	2008-09-14 20:08:09.000000000 +0300
+++ thebridge-1.06-mod/configure	2008-11-21 17:27:47.000000000 +0200
@@ -5116,7 +5116,7 @@
 _ACEOF
 
 
-                                                                      ac_config_files="$ac_config_files Makefile src/Makefile common/Makefile inc/Makefile tbdcmd/Makefile zlib/Makefile addons/Makefile"
+                                                                      ac_config_files="$ac_config_files Makefile src/Makefile common/Makefile inc/Makefile tbdcmd/Makefile addons/Makefile"
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
@@ -5699,7 +5699,6 @@
   "common/Makefile" ) CONFIG_FILES="$CONFIG_FILES common/Makefile" ;;
   "inc/Makefile" ) CONFIG_FILES="$CONFIG_FILES inc/Makefile" ;;
   "tbdcmd/Makefile" ) CONFIG_FILES="$CONFIG_FILES tbdcmd/Makefile" ;;
-  "zlib/Makefile" ) CONFIG_FILES="$CONFIG_FILES zlib/Makefile" ;;
   "addons/Makefile" ) CONFIG_FILES="$CONFIG_FILES addons/Makefile" ;;
   "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
   "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
diff -Naur thebridge-1.06/Makefile.in thebridge-1.06-mod/Makefile.in
--- thebridge-1.06/Makefile.in	2008-09-14 20:08:09.000000000 +0300
+++ thebridge-1.06-mod/Makefile.in	2008-11-21 17:34:34.000000000 +0200
@@ -201,7 +201,7 @@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-SUBDIRS = common zlib src inc tbdcmd addons
+SUBDIRS = common src inc tbdcmd addons
 EXTRA_DIST = theBridge.dsp tbd.conf.sample README.txt FreeBSD RedHat SCRIPTING.txt
 sysconf_DATA = tbd.conf.sample
 all: config.h
diff -Naur thebridge-1.06/src/Makefile.in thebridge-1.06-mod/src/Makefile.in
--- thebridge-1.06/src/Makefile.in	2008-09-14 20:08:08.000000000 +0300
+++ thebridge-1.06-mod/src/Makefile.in	2008-11-21 17:36:04.000000000 +0200
@@ -117,7 +117,7 @@
 tbd_OBJECTS = $(am_tbd_OBJECTS)
 am__DEPENDENCIES_1 =
 @LINK_BOX_FALSE at tbd_DEPENDENCIES = $(top_builddir)/common/libcommon.a \
- at LINK_BOX_FALSE@	$(top_builddir)/zlib/libzlib.a \
+ at LINK_BOX_FALSE@	-lz \
 @LINK_BOX_FALSE@	$(am__DEPENDENCIES_1)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
@@ -226,12 +226,12 @@
 @LINK_BOX_TRUE@                   dirclient.c dirclient.h thebridge.c users.c users.h \
 @LINK_BOX_TRUE@                   hostfile.c hostfile.h eventhook.c eventhook.h avrs.c avrs.h 
 
- at LINK_BOX_FALSE@AM_CPPFLAGS = -I$(top_srcdir)/inc -I$(top_srcdir)/zlib -I$(top_srcdir)/spandsp \
+ at LINK_BOX_FALSE@AM_CPPFLAGS = -I$(top_srcdir)/inc -I$(includedir)/zlib -I$(top_srcdir)/spandsp \
 @LINK_BOX_FALSE@              -DSYSCON_DIR=\"$(sysconfdir)\"
 
 @LINK_BOX_TRUE at AM_CPPFLAGS = -I$(top_srcdir)/inc \
 @LINK_BOX_TRUE@	-I$(top_srcdir)/gsm/inc -DLINK_BOX \
- at LINK_BOX_TRUE@	-I$(top_srcdir)/zlib -I$(top_srcdir)/linkbox \
+ at LINK_BOX_TRUE@	-I$(includedir)/zlib -I$(top_srcdir)/linkbox \
 @LINK_BOX_TRUE@	-DSYSCON_DIR=\"$(sysconfdir)\" $(am__append_1)
 @LINK_BOX_FALSE at AM_CFLAGS = -Wall $(am__append_2)
 @LINK_BOX_TRUE at AM_CFLAGS = -Wall $(am__append_2)
@@ -239,7 +239,7 @@
 @LINK_BOX_FALSE@        dirclient.h thebridge.c users.c users.h hostfile.c hostfile.h \
 @LINK_BOX_FALSE@        eventhook.c eventhook.h avrs.c avrs.h
 
- at LINK_BOX_FALSE@tbd_LDADD = $(top_builddir)/common/libcommon.a $(top_builddir)/zlib/libzlib.a \
+ at LINK_BOX_FALSE@tbd_LDADD = $(top_builddir)/common/libcommon.a -lz \
 @LINK_BOX_FALSE@            $(LIBDMALLOC) -lm
 
 all: all-am


--- NEW FILE thebridge.init ---
#!/bin/bash
#
# thebridge.init for version 0.96.  starts or stops the bridge.
# This file should be placed in /etc/rc.d/init.d/
#
# chkconfig: - 60 50
# description: thebridge is a iLink/EchoLink compatible conference bridge
# processname: tbd
# 

# Source function library.
. /etc/rc.d/init.d/functions

# Source networking configuration.
. /etc/sysconfig/network

# Check that networking is up.
[ ${NETWORKING} = "no" ] && exit 0

[ -x /usr/libexec/tbd ] || exit 0


RETVAL=0
prog="tbd"

start() {
        # Start daemons.
        echo -n $"Starting $prog: "
        daemon /usr/libexec/tbd $OPTS
        RETVAL=$?
        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/thebridge
        echo
        return $RETVAL
}

stop() {
        # Stop daemons.
        echo -n $"Shutting down $prog: "
        killproc $prog
        RETVAL=$?
        echo
        [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/thebridge
        return $RETVAL
}

# See how we were called.
case "$1" in
  start)
        start
        ;;
  stop)
        stop
        ;;
  restart|reload)
        stop
        start
        RETVAL=$?
        ;;
  condrestart)
        if [ -f /var/lock/subsys/thebridge ]; then
            stop
            start
            RETVAL=$?
        fi
        ;;
  status)
        status $prog
        RETVAL=$?
        ;;
  *)
        echo $"Usage: $0 {start|stop|restart|condrestart|status}"
        exit 1
esac

exit $RETVAL


--- NEW FILE thebridge.spec ---
Name:		thebridge
Version:	1.06
Release:	3%{?dist}
Summary:	ILink/EchoLink compatible conference bridge

Group:		Applications/Internet
License:	GPLv2+
URL:		http://cqinet.sourceforge.net/thebridge.shtml
Source0:	http://downloads.sourceforge.net/cqinet/%{name}-%{version}.tgz
Source1:	thebridge.init
Patch0:		thebridge-1.06-zlib.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	zlib-devel
Requires (preun): chkconfig
Requires (preun): initscripts
Requires (post): chkconfig
Requires (postun): initscripts

%description
Thebridge is an EchoLink compatible conference bridge that runs under
Linux.

EchoLink allows licensed Amateur Radio stations to communicate with one
another over the Internet, using voice-over-IP (VoIP) technology. 


%prep
%setup -q
%patch0 -p1 -b .zlib


%build
%configure
make %{?_smp_mflags}


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} INSTALL="install -p"
#fix wrong permissions on packaged files
chmod -x ChangeLog README SCRIPTING.txt src/*
mv -f %{buildroot}%{_sysconfdir}/tbd.conf.sample %{buildroot}%{_sysconfdir}/tbd.conf
mkdir -p %{buildroot}%{_localstatedir}/lib/tbd
sed -i -e 's!WorkingDir = /usr/home/tbd!WorkingDir = %{_localstatedir}/lib/tbd!g' %{buildroot}%{_sysconfdir}/tbd.conf
#fix wrong symlink
(cd %{buildroot}%{_bindir} && rm -f tbdchat && ln -s tbdcmd tbdchat)

mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d
install -m 755 %{SOURCE1} %{buildroot}%{_sysconfdir}/rc.d/init.d/thebridge


%clean
rm -rf %{buildroot}

%post
/sbin/chkconfig --add thebridge

%preun
if [ $1 = 0 ]; then
 /sbin/service thebridge stop > /dev/null 2>&1
 /sbin/chkconfig --del thebridge
fi

%postun
if [ "$1" -ge "1" ] ; then
 /sbin/service thebridge condrestart >/dev/null 2>&1 || :
fi


%files
%defattr(-,root,root,-)
%doc COPYING ChangeLog README SCRIPTING.txt
%{_bindir}/tbdchat
%{_bindir}/tbdcmd
%{_libexecdir}/tbd
%{_sysconfdir}/rc.d/init.d/thebridge
%config(noreplace) %attr(644,root,root) %{_sysconfdir}/tbd.conf
%{_localstatedir}/lib/tbd/



%changelog
* Wed Dec 03 2008 Lucian Langa <cooly at gnome.eu.org> - 1.06-3
- fix source0 and requirements

* Fri Nov 21 2008 Lucian Langa <cooly at gnome.eu.org> - 1.06-2
- description fix
- new upstream

* Wed Sep 10 2008 Lucian Langa <cooly at gnome.eu.org> - 0.96-1
- initial specfile




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/thebridge/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Dec 2008 03:32:06 -0000	1.1
+++ .cvsignore	7 Dec 2008 14:54:02 -0000	1.2
@@ -0,0 +1 @@
+thebridge-1.06.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/thebridge/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Dec 2008 03:32:06 -0000	1.1
+++ sources	7 Dec 2008 14:54:02 -0000	1.2
@@ -0,0 +1 @@
+cbd0347d90a4156a806402f7875e7817  thebridge-1.06.tgz


