rpms/tokyotyrant/devel import.log, NONE, 1.1 tokyotyrant-1.1.33.build.patch, NONE, 1.1 tokyotyrant.init, NONE, 1.1 tokyotyrant.logrotate, NONE, 1.1 tokyotyrant.spec, NONE, 1.1 tokyotyrant.sysconfig, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Silas Sewell
silas at fedoraproject.org
Tue Aug 25 04:54:40 UTC 2009
Author: silas
Update of /cvs/pkgs/rpms/tokyotyrant/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15916/devel
Modified Files:
.cvsignore sources
Added Files:
import.log tokyotyrant-1.1.33.build.patch tokyotyrant.init
tokyotyrant.logrotate tokyotyrant.spec tokyotyrant.sysconfig
Log Message:
* Fri Aug 21 2009 Silas Sewell <silas at sewell.ch> - 1.1.33-5
- Fix url
* Thu Aug 20 2009 Silas Sewell <silas at sewell.ch> - 1.1.33-4
- Add requires tokyocabinet to tokyotyrant.pc
* Tue Aug 18 2009 Silas Sewell <silas at sewell.ch> - 1.1.33-3
- Add tokyocabinet to tokyotyrant.pc
- More spec fixes
* Sun Aug 16 2009 Silas Sewell <silas at sewell.ch> - 1.1.33-2
- Various spec fixes
* Tue Aug 11 2009 Silas Sewell <silas at sewell.ch> - 1.1.33-1
- Initial package
--- NEW FILE import.log ---
tokyotyrant-1_1_33-5_fc12:HEAD:tokyotyrant-1.1.33-5.fc12.src.rpm:1251175673
tokyotyrant-1.1.33.build.patch:
configure.in | 23 +++--------------------
tokyotyrant.pc.in | 3 ++-
2 files changed, 5 insertions(+), 21 deletions(-)
--- NEW FILE tokyotyrant-1.1.33.build.patch ---
diff -up tokyotyrant-1.1.33/configure.in.orig tokyotyrant-1.1.33/configure.in
--- tokyotyrant-1.1.33/configure.in.orig 2009-08-10 23:12:47.210050407 -0400
+++ tokyotyrant-1.1.33/configure.in 2009-08-10 23:14:11.655075602 -0400
@@ -28,32 +28,15 @@ MYDOCUMENTFILES="COPYING ChangeLog THANK
MYPCFILES="tokyotyrant.pc"
# Building flags
-MYCFLAGS="-std=c99 -Wall -fPIC -fsigned-char -O2"
-MYCPPFLAGS="-I. -I\$(INCLUDEDIR) -I$HOME/include -I/usr/local/include"
+MYCFLAGS="-std=c99 -Wall -fPIC -fsigned-char"
+MYCPPFLAGS="-I. -I\$(INCLUDEDIR)"
MYCPPFLAGS="$MYCPPFLAGS -DNDEBUG -D_GNU_SOURCE=1 -D_REENTRANT -D__EXTENSIONS__"
-MYLDFLAGS="-L. -L\$(LIBDIR) -L$HOME/lib -L/usr/local/lib"
+MYLDFLAGS="-L. -L\$(LIBDIR)"
MYCMDLDFLAGS=""
MYRUNPATH="\$(LIBDIR)"
MYLDLIBPATHENV="LD_LIBRARY_PATH"
MYPOSTCMD="true"
-# Building paths
-PATH="$PATH:$HOME/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin"
-PATH="$PATH:/opt/SUNWspro/bin:/usr/ccs/bin:/usr/xpg4/bin:/usr/xpg6/bin:/usr/ucb"
-CPATH="$HOME/include:/usr/local/include:$CPATH"
-LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LIBRARY_PATH"
-LD_LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH"
-PKG_CONFIG_PATH="$HOME/lib/pkgconfig:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH"
-export PATH CPATH LIBRARY_PATH LD_LIBRARY_PATH PKG_CONFIG_PATH
-if type pkg-config > /dev/null 2>&1
-then
- PATH="$PATH:`pkg-config --variable=bindir tokyocabinet`"
- CPATH="$CPATH:`pkg-config --variable=includedir tokyocabinet`"
- LIBRARY_PATH="$LIBRARY_PATH:`pkg-config --variable=libdir tokyocabinet`"
- LD_LIBRARY_PATH="$LD_LIBRARY_PATH:`pkg-config --variable=libdir tokyocabinet`"
-fi
-
-
#================================================================
# Options
diff -up tokyotyrant-1.1.33/tokyotyrant.pc.in.orig tokyotyrant-1.1.33/tokyotyrant.pc.in
--- tokyotyrant-1.1.33/tokyotyrant.pc.in.orig 2009-08-10 23:14:20.984050799 -0400
+++ tokyotyrant-1.1.33/tokyotyrant.pc.in 2009-08-20 22:13:50.658534663 -0400
@@ -10,5 +10,6 @@ datadir=@datadir@
Name: Tokyo Tyrant
Description: network interface of Tokyo Cabinet
Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -ltokyotyrant @LIBS@
+Requires: tokyocabinet
+Libs: -L${libdir} -ltokyotyrant
Cflags: -I${includedir}
--- NEW FILE tokyotyrant.init ---
#!/bin/sh
#
# ttserver - this script starts and stops the tokyotyrant server
#
# chkconfig: - 64 36
# description: Tokyo Tyrant is a network interface to the DBM called Tokyo
# Cabinet.
# processname: ttserver
# config: /etc/sysconfig/tokyotyrant
# pidfile: /var/run/tokyotyrant/tokyotyrant.pid
# Source function library
. /etc/rc.d/init.d/functions
basedir="/var/lib/tokyotyrant"
bin="/usr/bin/ttserver"
config="/etc/sysconfig/tokyotyrant"
lockfile="/var/lock/subsys/tokyotyrant"
pidfile="/var/run/tokyotyrant/tokyotyrant.pid"
prog="Tokyo Tyrant"
PORT="1978"
THREADS="8"
TIMEOUT="0"
LOG="/var/log/tokyotyrant/ttserver.log"
DATABASE="$basedir/casket.tch#bnum=1000000"
MAX_CONNECTIONS="65535"
OPTIONS=""
[ -e "$config" ] && . "$config"
start() {
if [ -n "$MAX_CONNECTIONS" ] ; then
ulimit -n "$MAX_CONNECTIONS" >/dev/null 2>&1
fi
echo -n $"Starting $prog: "
daemon --user=tokyotyrant $bin -dmn -pid "$pidfile" -port "$PORT" -thnum "$THREADS" -tout "$TIMEOUT" -log "$LOG" "$DATABASE" $OPTIONS
retval=$?
echo
return $retval
}
stop() {
echo -n $"Stopping $prog: "
killproc $bin
retval=$?
echo
return $retval
}
restart() {
stop
start
}
rh_status() {
status ttserver
}
rh_status_q() {
rh_status &> /dev/null
}
reload() {
echo "Not implemented"
}
force_reload() {
echo "Not implemented"
}
case "$1" in
start)
rh_status_q && exit 0
$1
;;
stop)
rh_status_q || exit 0
$1
;;
restart)
$1
;;
reload)
rh_status_q || exit 7
$1
;;
force-reload)
force_reload
;;
status)
rh_status
;;
condrestart|try-restart)
rh_status_q || exit 0
restart
;;
*)
echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
exit 2
esac
exit $?
--- NEW FILE tokyotyrant.logrotate ---
/var/log/tokyotyrant/*.log {
missingok
notifempty
size 30k
weekly
postrotate
/bin/kill -HUP `cat /var/run/tokyotyrant.pid 2> /dev/null` 2> /dev/null || true
endscript
}
--- NEW FILE tokyotyrant.spec ---
Name: tokyotyrant
Version: 1.1.33
Release: 5%{?dist}
Summary: A network interface to Tokyo Cabinet
Group: Applications/Databases
License: LGPLv2+
URL: http://tokyocabinet.sourceforge.net
Source0: http://tokyocabinet.sourceforge.net/tyrantpkg/%{name}-%{version}.tar.gz
Source1: tokyotyrant.logrotate
Source2: tokyotyrant.init
Source3: tokyotyrant.sysconfig
Patch0: tokyotyrant-1.1.33.build.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: %{name}-libs = %{version}-%{release}
Requires: logrotate
Requires(post): chkconfig
Requires(postun): initscripts
Requires(pre): shadow-utils
Requires(preun): chkconfig
Requires(preun): initscripts
BuildRequires: autoconf
BuildRequires: bzip2-devel
BuildRequires: lua-devel
BuildRequires: tokyocabinet-devel >= 1.4.30
BuildRequires: zlib-devel
%description
Tokyo Tyrant is a network interface to Tokyo Cabinet.
%package libs
Summary: Runtime library files for %{name}
Group: System Environment/Libraries
%description libs
Tokyo Tyrant is a network interface to Tokyo Cabinet.
The %{name}-libs package contains libraries for running %{name}
applications.
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
Requires: pkgconfig
Requires: tokyocabinet-devel
%description devel
Tokyo Tyrant is a network interface to Tokyo Cabinet.
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.
%prep
%setup -q
%patch0 -p1
%build
%{__sed} -i '/LD_RUN_PATH/d' Makefile.in
autoconf
%configure --enable-lua
%{__make} %{?_smp_mflags}
%install
%{__rm} -fr %{buildroot}
%{__make} DESTDIR=%{buildroot} install
# Install sysconfig and init files
%{__install} -p -m 0644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
%{__install} -p -m 0755 -D %{SOURCE2} %{buildroot}%{_initddir}/%{name}
%{__install} -p -m 0644 -D %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/%{name}
%{__install} -p -m 0755 -d %{buildroot}%{_localstatedir}/log/%{name}
%{__install} -p -m 0755 -d %{buildroot}%{_localstatedir}/run/%{name}
%{__install} -p -m 0755 -d %{buildroot}%{_sharedstatedir}/%{name}
# Remove un-needed files
%{__rm} -f %{buildroot}%{_sbindir}/ttservctl
%{__rm} -f %{buildroot}%{_libdir}/lib%{name}.a
# Remove doc files installed by make
%{__rm} -f %{buildroot}%{_datadir}/%{name}/COPYING
%{__rm} -f %{buildroot}%{_datadir}/%{name}/ChangeLog
%{__rm} -f %{buildroot}%{_datadir}/%{name}/THANKS
%{__rm} -fr %{buildroot}%{_datadir}/%{name}/doc
# Move non lib* shared libraries into sub-directory
%{__mkdir_p} %{buildroot}%{_libdir}/%{name}
%{__mv} %{buildroot}%{_libdir}/t*.so %{buildroot}%{_libdir}/%{name}
%clean
%{__rm} -fr %{buildroot}
%post
/sbin/chkconfig --add tokyotyrant
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
%pre
getent group %{name} >/dev/null || groupadd -r %{name}
getent passwd %{name} >/dev/null || \
useradd -r -g %{name} -d %{_sharedstatedir}/%{name} -s /sbin/nologin \
-c 'Tokyo Tyrant Server' %{name}
exit 0
%preun
if [ $1 = 0 ]; then
/sbin/service tokyotyrant stop &> /dev/null
/sbin/chkconfig --del tokyotyrant
fi
%files
%defattr(-,root,root,-)
%doc ChangeLog doc/
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
%{_bindir}/t*
%{_datadir}/%{name}
%{_initddir}/%{name}
%attr(0755,tokyotyrant,tokyotyrant) %dir %{_localstatedir}/log/%{name}
%attr(0755,tokyotyrant,tokyotyrant) %dir %{_localstatedir}/run/%{name}
%{_mandir}/man1/t*.gz
%{_mandir}/man8/t*.gz
%attr(0755,tokyotyrant,tokyotyrant) %dir %{_sharedstatedir}/%{name}
%files libs
%defattr(-,root,root,-)
%doc COPYING README THANKS
%{_libdir}/%{name}
%{_libdir}/lib%{name}.so.*
%files devel
%defattr(-,root,root,-)
%{_includedir}/t*.h
%{_libdir}/libtokyotyrant.so
%{_libdir}/pkgconfig/%{name}.pc
%{_mandir}/man3/t*.gz
%changelog
* Fri Aug 21 2009 Silas Sewell <silas at sewell.ch> - 1.1.33-5
- Fix url
* Thu Aug 20 2009 Silas Sewell <silas at sewell.ch> - 1.1.33-4
- Add requires tokyocabinet to tokyotyrant.pc
* Tue Aug 18 2009 Silas Sewell <silas at sewell.ch> - 1.1.33-3
- Add tokyocabinet to tokyotyrant.pc
- More spec fixes
* Sun Aug 16 2009 Silas Sewell <silas at sewell.ch> - 1.1.33-2
- Various spec fixes
* Tue Aug 11 2009 Silas Sewell <silas at sewell.ch> - 1.1.33-1
- Initial package
--- NEW FILE tokyotyrant.sysconfig ---
# Configuration settings for Tokyo Tyrant.
PORT="1978"
THREADS="8"
TIMEOUT="0"
OPTIONS=""
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tokyotyrant/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore 24 Aug 2009 19:53:21 -0000 1.1
+++ .cvsignore 25 Aug 2009 04:54:40 -0000 1.2
@@ -0,0 +1 @@
+tokyotyrant-1.1.33.tar.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tokyotyrant/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources 24 Aug 2009 19:53:21 -0000 1.1
+++ sources 25 Aug 2009 04:54:40 -0000 1.2
@@ -0,0 +1 @@
+880d6af48458bc04b993bdae6ecc543d tokyotyrant-1.1.33.tar.gz
More information about the fedora-extras-commits
mailing list