update: MySQL-ruby, darts, htdig, sary

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@3475 ec354946-7b23-47d6-9f5a-488ba84defc7

M/MySQL-ruby/MySQL-ruby-vl.spec

@@ -8,26 +8,28 @@
 %define incdir   %(ruby -r rbconfig -e 'print Config::CONFIG["includedir"]')
 %define mandir   %(ruby -r rbconfig -e 'print Config::CONFIG["mandir"]')
 
-Summary: mysql module for Ruby
 Name: MySQL-ruby
-Version: 2.7.6
-Release: 2%{?_dist_release}
-License: distributable
+Summary: mysql module for Ruby
+Summary(ja): Ruby 用の MySQL 拡張モジュール
+Version: 2.8.2
+Release: 1%{?_dist_release}
+
 Group: Development/Libraries
-Source: http://www.tmtm.org/mysql/ruby/%{oname}-%{version}.tar.gz
+License: distributable
 URL: http://www.tmtm.org/mysql/ruby/
+
+Source: http://www.tmtm.org/mysql/ruby/%{oname}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: ruby
 BuildRequires: ruby-devel >= 1.8.1
 BuildRequires: MySQL-devel
 Requires:      libruby >= 1.8.1
-Summary(ja): Ruby 用の MySQL 拡張モジュール
 
 %description
 This is MySQL Ruby API. This have same function as C API.
 
 %description -l ja
-これは MySQL の Ruby API です。MySQL の C API とほぼ同等の機能があります。
+これは MySQL の Ruby API です．MySQL の C API とほぼ同等の機能があります．
 
 %prep
 %setup -q -n %{oname}-%{version}
@@ -39,12 +41,12 @@ ruby extconf.rb --with-mysql-config
 make
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
-mkdir -p ${RPM_BUILD_ROOT}%{_libdir}
+rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT%{_libdir}
 
 # installing binaries ...
-make install prefix=${RPM_BUILD_ROOT}%{prefix} \
-             sitedir=${RPM_BUILD_ROOT}%{_libdir}/ruby
+make install sitearchdir=$RPM_BUILD_ROOT%{rarchdir}
+#_libdir}/ruby
 
 (find \
   $RPM_BUILD_ROOT%{_libdir} \
@@ -52,7 +54,7 @@ make install prefix=${RPM_BUILD_ROOT}%{prefix} \
  sort | sed -e "s,^$RPM_BUILD_ROOT,," > MySQL-ruby.files
 
 %clean
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf $RPM_BUILD_ROOT
 
 %pre
 
@@ -60,9 +62,13 @@ rm -rf ${RPM_BUILD_ROOT}
 
 %files -f MySQL-ruby.files
 %defattr(-, root, root)
-%doc README.html README_ja.html test.rb
+%doc COPYING COPYING.ja README.html README_ja.html tommy.css test.rb
 
 %changelog
+* Sat Apr 16 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.8.2-1
+- updated to 2.8.2
+- built with MySQL-5.1.56
+
 * Fri May 22 2009 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.7.6-2
 - rebuilt with MySQL-5.1.34.
 

d/darts/darts-vl.spec

@@ -2,9 +2,10 @@ Summary: Double ARray Trie System
 Summary(ja): Double-Array を構築するためのライブラリ
 Name: darts
 Version: 0.32
-Release: 1%{?_dist_release}
-License: LGPL
+Release: 2%{?_dist_release}
+
 Group: System Environment/Libraries
+License: LGPLv2
 URL: http://chasen.org/~taku/software/darts/
 Source: %{name}-%{version}.tar.gz
 
@@ -56,6 +57,9 @@ make CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS"
 %{_includedir}/darts.h
 
 %changelog
+* Wed Apr 13 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.32-2
+- rebuilt with current VineSeed
+
 * Sun Jun  7 2009 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.32-1
 - new upstream release
 - spec in UTF-8

h/htdig/htdig-vl.spec

@@ -1,46 +1,46 @@
-%define vine4 1
-
-%define date 20030601
 %define buildweb 1
 %define beta b6
 
-%if %{vine4}
 %define contentdir /var/www
 %define apachebin %{_sbindir}/apache2
-%else
-%define contentdir /home/httpd
-%define apachebin %{_sbindir}/httpd
-%endif
 
-Summary: ht://Dig - Web search engine
 Name: htdig
+Summary: ht://Dig - Web search engine
+Summary(ja): ht://Dig Web 検索エンジン
 Version: 3.2.0
-#Release: 6.1vl1.%{beta}
-Release: 7.%{beta}%{?_dist_release}
-License: GPL
+Release: 8.%{beta}%{?_dist_release}
+
+License: GPLv2
 Group: Applications/Internet
-Url: http://www.htdig.org/
+URL: http://www.htdig.org/
+
 Source: http://www.htdig.org/files/%{name}-%{version}%{beta}.tar.bz2
 Source1: htdig.conf
-Patch0: htdig-3.1.5-rh.patch
-Patch1: htdig-3.2.0b3-glibc222.patch
+Patch1: htdig-3.1.5-rh.patch
 Patch2: htdig-3.2.0b4-xopen.patch
-Patch3: htdig-3.2.0b4-h_hash.patch
 Patch4: htdig-3.2.0b5-overflow.patch
-Patch5: htdig-3.2.0b5-expr.patch
-Patch6: htdig-3.2.0b5-destdir.patch
-Patch7: htdig-3.2.0b5-mktemp.patch
-# build for gcc4
-Patch100: htdig-3.2.0b6-gcc4.patch
+Patch5: htdig-3.2.0b6-robots.patch
+Patch6: htdig-3.2.0b6-unescaped_output.patch
+Patch8: htdig-3.2.0b6-compile-fix.patch
+Patch9: htdig-3.2.0b6-opts.patch
+Patch11: htdig-3.2.0b6-incremental.patch
+Patch12: htdig-3.2-CVE-2007-6110.patch
+Patch13: htdig-3.2.0b6-htstat-segv.patch
+Patch14: htdig-3.2.0-external_parsers.patch
+Patch15: htdig-3.2.0-allow_numbers.patch
 
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: flex >= 2.5.4a-13
 BuildRequires: zlib-devel
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRequires: openssl-devel
+BuildRequires: apache2
+BuildRequires: autoconf automake libtool
 
 %package web
 Summary: Scripts and HTML code needed for using ht://Dig as a web search engine
 Group: Applications/Internet
-Requires: %{name} = %{version} webserver
+Requires: %{name} = %{version}
+Requires: webserver
 
 %description
 The ht://Dig system is a complete world wide web indexing and searching
@@ -75,42 +75,20 @@ various web servers on the campus network.
 
 %prep
 %setup -q -n %{name}-%{version}%{beta}
-%patch -p1 -b .rh
-%patch1 -p1 -b .glibc222
+%patch1 -p1 -b .rh
 %patch2 -p1 -b .xopen
-%patch3 -p1 -b .h_hash
 %patch4 -p1 -b .overflow
-#patch5 -p1 -b .expr
-#patch6 -p1 -b .destdir
-#patch7 -p1 -b .mktemp
-
-%patch100 -p1 -b .gcc4
-
-# Fix the flex output file for glibc 2.2 compatibility
-cd htcommon
-flex -oconf_lexer.cxx conf_lexer.lxx
-cd ..
-
-cd htlib
-# This is a *VERY* dirty hack, until I figure out what's
-# causing this to break...
-for i in *.cc; do
-	mv $i $i.foo
-	cat >$i <<EOF
-#include <stdio.h>
-#include <string.h>
-EOF
-	cat $i.foo >>$i
-	rm -f $i.foo
-done
-for i in clib.h; do
-	mv $i $i.foo
-	cat >$i <<EOF
-#include "htconfig.h"
-EOF
-	cat $i.foo >>$i
-	rm -f $i.foo
-done
+%patch5 -p1 -b .robots
+%patch6 -p1 -b .unescaped_output
+%patch8 -p1 -b .compile-fix
+%patch9 -p1 -b .opts
+%patch11 -p1 -b .incremental
+%patch12 -p1 -b .CVE-2007-6110
+%patch13 -p1 -b .htstat-segv
+%patch14 -p1 -b .external_parsers
+%patch15 -p1 -b .allow_numbers
+
+autoreconf -fiv
 
 %build
 %configure \
@@ -126,7 +104,8 @@ done
 	--with-search-dir=%{contentdir}/html/htdig \
 	--with-default-config-file=%{_sysconfdir}/htdig/htdig.conf \
 	--with-apache=%{apachebin} \
-	--with-zlib=%{_prefix}
+	--with-zlib=%{_prefix} \
+        --with-ssl
 make
 
 %install
@@ -147,6 +126,10 @@ mkdir -p $RPM_BUILD_ROOT/etc/httpd/conf.d/
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/httpd/conf.d/htdig.conf
 
 rm -rf $RPM_BUILD_ROOT%{_includedir}
+rm -rf $RPM_BUILD_ROOT%{_libdir}/htdig/*.a
+rm -rf $RPM_BUILD_ROOT%{_libdir}/htdig/*.la
+rm -rf $RPM_BUILD_ROOT%{_libdir}/htdig_db/*.a
+rm -rf $RPM_BUILD_ROOT%{_libdir}/htdig_db/*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -176,6 +159,11 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Sat Apr 16 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 3.2.0-8.b6
+- rebuilt with current VineSeed
+- replaced Patch100 to Patch8
+- added --with-ssl option to %%configure
+
 * Sat Aug 16 2008 Shu KONNO <owa@bg.wakwak.com> 3.2.0-7.b6vl5
 - applied new versioning policy
 

s/sary/sary-vl.spec

@@ -1,6 +1,6 @@
 %define name sary
 %define version	1.2.0
-%define release	1%{?_dist_release}
+%define release	2%{?_dist_release}
 
 Summary:	Suffix array library (with tools)
 Name:		%{name}
@@ -43,13 +43,15 @@ points to those fields.
 %build
 [[ ! -x configure ]] && ./autogen.sh
 
-%configure
+%configure --disable-static
 %{__make} %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__make} DESTDIR=$RPM_BUILD_ROOT install
 
+rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -70,13 +72,17 @@ rm -rf $RPM_BUILD_ROOT
 %files -n %{name}-devel
 %defattr(-,root,root)
 %{_includedir}/*
-%{_libdir}/libsary.a
-%{_libdir}/libsary.la
+#{_libdir}/libsary.a
+#{_libdir}/libsary.la
 %{_libdir}/libsary.so
 %{_libdir}/pkgconfig/sary.pc
 
 
 %changelog
+* Sat Apr 16 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.2.0-2
+- rebuilt with current VineSeed
+- removed static libraries from devel package
+
 * Sat Nov 01 2008 Munehiro Yamamoto <munepi@cg8.so-net.ne.jp> 1.2.0-1
 - initial build for VineSeed