stone,tcpdump: rebuild with openssl-1.0.0c, xmlsec1: new upstream release

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

s/stone/stone-vl.spec

@@ -9,7 +9,7 @@ Summary: The stone is TCP and UDP packet repeater.
 Summary(ja): TCP & UDP パケットリピータ stone
 Name: stone
 Version: 2.3e
-Release: 1%{_dist_release}
+Release: 2%{_dist_release}
 URL: http://www.gcd.org/sengoku/stone/
 Source0: http://www.gcd.org/sengoku/stone/%{name}-%{version}.tar.gz
 # 'rfc1321.txt', 'global.h', 'md5.h', and 'md5c.c'
@@ -27,7 +27,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Prefix: %{_prefix}
 
 Requires: openssl
-BuildPrereq: openssl-devel
+BuildRequires: openssl-devel
 
 
 %description
@@ -96,6 +96,9 @@ rm -rf ${RPM_BUILD_ROOT}
 # ----------------------------------------------------------
 
 %changelog
+* Sat Jan 29 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.3e-2
+- rebuild with openssl-1.0.0c
+
 * Mon Jun 22 2009 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 2.3e-1
 - new upstream release
 - new versioning policy and spec in UTF-8

t/tcpdump/tcpdump-vl.spec

@@ -7,7 +7,7 @@ Name: tcpdump
 Version: %{tcpdump_ver}
 %define	tcpdump_dir	tcpdump-%{tcpdump_ver}
 %define tcpslice_dir	tcpslice
-Release: 2%{?_dist_release}
+Release: 3%{?_dist_release}
 Epoch: 1
 
 Group: Applications/System
@@ -137,6 +137,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Jan 29 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1:4.1.1-3
+- rebuild with openssl-1.0.0c
+
 * Sat Sep 18 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1:4.1.1-2
 - removed pcap header direction
 - added URL tag

x/xmlsec1/xmlsec1-vl.spec

@@ -1,6 +1,6 @@
 Summary: Library providing support for "XML Signature" and "XML Encryption" standards
 Name: xmlsec1
-Version: 1.2.12
+Version: 1.2.16
 Release: 1%{?_dist_release}
 License: MIT
 Group: System Environment/Libraries
@@ -11,6 +11,7 @@ Requires: libxml2 >= 2.6.0
 Requires: libxslt >= 1.1.0
 BuildRequires: libxml2-devel >= 2.6.0
 BuildRequires: libxslt-devel >= 1.1.0
+BuildRequires: libtool-ltdl-devel
 Prefix: %{_prefix}
 Docdir: %{_docdir}
 
@@ -60,6 +61,24 @@ Requires: openssl-devel >= 0.9.6
 %description openssl-devel
 Libraries, includes, etc. for developing XML Security applications with OpenSSL
 
+%package gcrypt
+Summary: GCrypt crypto plugin for XML Security Library
+Group: Development/Libraries
+Requires: xmlsec1 = %{version}
+
+%description gcrypt
+GCrypt plugin for XML Security Library provides GCrypt based crypto services
+for the xmlsec library.
+
+%package gcrypt-devel
+Summary: GCrypt crypto plugin for XML Security Library
+Group: Development/Libraries
+Requires: xmlsec1-devel = %{version}-%{release}
+Requires: xmlsec1-gnutls-devel = %{version}-%{release}
+
+%description gcrypt-devel
+Libraries, includes, etc. for developing XML Security applications with GCrypt.
+
 %package gnutls
 Summary: GNUTls crypto plugin for XML Security Library
 Group: System Environment/Libraries 
@@ -163,6 +182,10 @@ rm -fr %{buildroot}
 
 %postun openssl -p /sbin/ldconfig
 
+%post gcrypt -p /sbin/ldconfig
+
+%postun gcrypt -p /sbin/ldconfig
+
 %post gnutls -p /sbin/ldconfig
 
 %postun gnutls -p /sbin/ldconfig
@@ -176,18 +199,18 @@ rm -fr %{buildroot}
 %defattr(-, root, root)
 %doc AUTHORS ChangeLog NEWS README Copyright
 %doc %{_mandir}/man1/xmlsec1.1*
-%{prefix}/lib*/libxmlsec1.so.*
+%{_libdir}/libxmlsec1.so.*
-%{prefix}/bin/xmlsec1
+%{_bindir}/xmlsec1
 
 %files devel
 %defattr(-, root, root)  
-%{prefix}/bin/xmlsec1-config
+%{_bindir}/xmlsec1-config
-%{prefix}/include/xmlsec1/xmlsec/*.h
+%{_includedir}/xmlsec1/xmlsec/*.h
-%{prefix}/include/xmlsec1/xmlsec/private/*.h
+%{_includedir}/xmlsec1/xmlsec/private/*.h
-%{prefix}/lib*/libxmlsec1.so
+%{_libdir}/libxmlsec1.so
 # %{prefix}/lib*/libxmlsec1.*a
-%{prefix}/lib*/pkgconfig/xmlsec1.pc
+%{_libdir}/pkgconfig/xmlsec1.pc
-%{prefix}/lib*/xmlsec1Conf.sh
+%{_libdir}/xmlsec1Conf.sh
 %{_datadir}/aclocal/*.m4
 %doc AUTHORS HACKING ChangeLog NEWS README Copyright
 %doc docs-to-install/*
@@ -195,38 +218,53 @@ rm -fr %{buildroot}
 
 %files openssl
 %defattr(-, root, root)  
-%{prefix}/lib*/libxmlsec1-openssl.so.*
+%{_libdir}/libxmlsec1-openssl.so.*
 
 %files openssl-devel
 %defattr(-, root, root)  
-%{prefix}/include/xmlsec1/xmlsec/openssl/*.h
+%{_includedir}/xmlsec1/xmlsec/openssl/*.h
 # %{prefix}/lib*/libxmlsec1-openssl.*a
-%{prefix}/lib*/libxmlsec1-openssl.so
+%{_libdir}/libxmlsec1-openssl.so
-%{prefix}/lib*/pkgconfig/xmlsec1-openssl.pc
+%{_libdir}/pkgconfig/xmlsec1-openssl.pc
+
+%files gcrypt
+%defattr(-, root, root, -)
+%{_libdir}/libxmlsec1-gcrypt.so.*
+
+%files gcrypt-devel
+%defattr(-, root, root, -)
+%{_includedir}/xmlsec1/xmlsec/gcrypt/
+%{_libdir}/libxmlsec1-gcrypt.so
+%{_libdir}/pkgconfig/xmlsec1-gcrypt.pc
 
 %files gnutls
 %defattr(-, root, root)  
-%{prefix}/lib*/libxmlsec1-gnutls.so.*
+%{_libdir}/libxmlsec1-gnutls.so.*
 
 %files gnutls-devel
 %defattr(-, root, root)  
-%{prefix}/include/xmlsec1/xmlsec/gnutls/*.h
+%{_includedir}/xmlsec1/xmlsec/gnutls/*.h
 # %{prefix}/lib*/libxmlsec1-gnutls.*a
-%{prefix}/lib*/libxmlsec1-gnutls.so
+%{_libdir}/libxmlsec1-gnutls.so
-%{prefix}/lib*/pkgconfig/xmlsec1-gnutls.pc
+%{_libdir}/pkgconfig/xmlsec1-gnutls.pc
 
 %files nss
 %defattr(-, root, root)  
-%{prefix}/lib*/libxmlsec1-nss.so.*
+%{_libdir}/libxmlsec1-nss.so.*
 
 %files nss-devel
 %defattr(-, root, root)  
-%{prefix}/include/xmlsec1/xmlsec/nss/*.h
+%{_includedir}/xmlsec1/xmlsec/nss/*.h
 # %{prefix}/lib*/libxmlsec1-nss.*a
-%{prefix}/lib*/libxmlsec1-nss.so
+%{_libdir}/libxmlsec1-nss.so
-%{prefix}/lib*/pkgconfig/xmlsec1-nss.pc
+%{_libdir}/pkgconfig/xmlsec1-nss.pc
 
 %changelog
+* Sat Jan 29 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.2.16-1
+- new upstream release
+- add BuildRequires: libtool-ltdl-devel
+- add -gcrypt,-gcrypt-devel package
+
 * Fri Jul 24 2009 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 1.2.12-1
 - new upstream release with security fix (CVE-2009-0217)
 - remove *.a files