packages: tokyocabinet/tokyocabinet.spec - up to 1.4.47, merge with spec i ...

[glen]

Author: glen                         Date: Thu Dec  8 11:58:05 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 1.4.47, merge with spec i stupididly created from scratch

---- Files affected:
packages/tokyocabinet:
   tokyocabinet.spec (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: packages/tokyocabinet/tokyocabinet.spec
diff -u packages/tokyocabinet/tokyocabinet.spec:1.8 packages/tokyocabinet/tokyocabinet.spec:1.9
--- packages/tokyocabinet/tokyocabinet.spec:1.8	Tue Aug 31 21:05:50 2010
+++ packages/tokyocabinet/tokyocabinet.spec	Thu Dec  8 12:58:00 2011
@@ -1,22 +1,27 @@
 # $Revision$, $Date$
+#
+# Conditional build:
+%bcond_without	static_libs	# don't build static libraries
+
 # TODO:
 # warning: Installed (but unpackaged) file(s) found:
 #    /usr/lib/tcawmgr.cgi
 Summary:	Supreme Database Management Library
 Summary(pl.UTF-8):	Supreme Database Management Library
 Name:		tokyocabinet
-Version:	1.4.46
+Version:	1.4.47
 Release:	1
-License:	LGPL
+License:	LGPL v2.1
 Group:		Libraries
-Source0:	http://1978th.net/tokyocabinet/%{name}-%{version}.tar.gz
+Source0:	http://fallabs.com/tokyocabinet/%{name}-%{version}.tar.gz
 # Source0-md5:	341dadd1f3d68760e350f7e731111786
-URL:		http://1978th.net/tokyocabinet/
+URL:		http://fallabs.com/tokyocabinet/
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	bzip2-devel
 BuildRequires:	libtool
 BuildRequires:	zlib-devel
+Requires:	%{name}-libs = %{version}-%{release}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -27,11 +32,19 @@
 a value. There is neither concept of data tables nor data types.
 Records are organized in hash table, B+ tree, or fixed-length array.
 
+%package libs
+Summary:	Shared library for Tokyo Cabinet
+Group:		Libraries
+Conflicts:	%{name} < 1.4.47-1
+
+%description libs
+Shared library for Tokyo Cabinet.
+
 %package devel
 Summary:	Header files for tokyocabinet library
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki tokyocabinet
 Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}-libs = %{version}-%{release}
 
 %description devel
 Header files for tokyocabinet library.
@@ -59,42 +72,68 @@
 %{__aclocal}
 %{__autoconf}
 %configure \
+	%{!?with_static_libs:--disable-static} \
 	--enable-off64
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/%{name}/doc
+%{__rm} $RPM_BUILD_ROOT%{_datadir}/%{name}/{COPYING,ChangeLog}
+
+install -d $RPM_BUILD_ROOT%{_datadir}/idl/%{name}
+mv $RPM_BUILD_ROOT%{_datadir}/{%{name},idl/%{name}}/tokyocabinet.idl
+
+install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+cp -a example/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post	-p /sbin/ldconfig
-%postun	-p /sbin/ldconfig
+%post	libs -p /sbin/ldconfig
+%postun	libs -p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
 %doc ChangeLog README
-%attr(755,root,root) %{_bindir}/tc*
-%attr(755,root,root) %{_libdir}/libtokyocabinet.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libtokyocabinet.so.?
-%{_datadir}/%{name}
+%attr(755,root,root) %{_bindir}/tcamgr
+%attr(755,root,root) %{_bindir}/tcbmgr
+%attr(755,root,root) %{_bindir}/tcfmgr
+%attr(755,root,root) %{_bindir}/tchmgr
+%attr(755,root,root) %{_bindir}/tctmgr
+%attr(755,root,root) %{_bindir}/tcucodec
+%attr(755,root,root) %{_bindir}/*test
 %{_mandir}/man1/tc*.1*
 
+%files libs
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/lib%{name}.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/lib%{name}.so.9
+
 %files devel
 %defattr(644,root,root,755)
 %doc doc/*
 %{_libdir}/libtokyocabinet.so
-%{_includedir}/tc*.h
-%{_pkgconfigdir}/tokyocabinet.pc
+%{_includedir}/tcadb.h
+%{_includedir}/tcbdb.h
+%{_includedir}/tcfdb.h
+%{_includedir}/tchdb.h
+%{_includedir}/tctdb.h
+%{_includedir}/tcutil.h
+%{_pkgconfigdir}/%{name}.pc
+%{_datadir}/idl/%{name}/tokyocabinet.idl
 %{_mandir}/man3/*.3*
+%{_examplesdir}/%{name}-%{version}
 
+%if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libtokyocabinet.a
+%endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -102,6 +141,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2011/12/08 11:58:00  glen
+- up to 1.4.47, merge with spec i stupididly created from scratch
+
 Revision 1.8  2010/08/31 19:05:50  areq
 - 1.4.46
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tokyocabinet/tokyocabinet.spec?r1=1.8&r2=1.9&f=u