Browse Source

ldns 1.6.7-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@2303 ec354946-7b23-47d6-9f5a-488ba84defc7
iwaim 13 years ago
parent
commit
a3032cf45e
1 changed files with 29 additions and 6 deletions
  1. 29 6
      l/ldns/ldns-vl.spec

+ 29 - 6
l/ldns/ldns-vl.spec

@@ -1,14 +1,22 @@
 %{?!with_python:      %global with_python      1}
+%{?!enable_gost:      %global enable_gost      0}
 
 %if %{with_python}
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %endif
 
+%if %{enable_gost}
+%define	subdir_conf_opt --disable-rpath --disable-static
+%else
+%define	subdir_conf_opt --disable-rpath --disable-static --disable-gost
+%endif
+
+
 Summary: Lowlevel DNS(SEC) library with API
 Summary(ja): 低レベルな DNS(SEC) ライブラリと API
 Name: ldns
-Version: 1.6.6
+Version: 1.6.7
 Release: 1%{?_dist_release}
 License: BSD
 Url: http://www.nlnetlabs.nl/%{name}/
@@ -16,7 +24,13 @@ Source: http://www.nlnetlabs.nl/downloads/%{name}-%{version}.tar.gz
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: libtool, autoconf, automake, gcc-c++, doxygen,
-BuildRequires: perl, libpcap-devel, openssl-devel
+BuildRequires: perl, libpcap-devel
+%if %{enable_gost}
+BuildRequires: openssl-devel >= 1.0.0
+%else
+BuildRequires: openssl-devel
+%endif
+
 Requires: libpcap, openssl
 
 Distribution: Vine Linux
@@ -56,13 +70,17 @@ Python extensions for ldns
 %setup -q 
 
 %build
-%configure --disable-rpath --disable-static --with-sha2 \
+%configure --disable-rpath --disable-static \
 %if %{with_python}
- --with-pyldns
+ --with-pyldns \
+%endif
+%if !%{enable_gost}
+ --disable-gost \
 %endif
+ --with-sha2
 
-(cd drill ; %configure --disable-rpath --disable-static --with-ldns=%{buildroot}/lib/ )
-(cd examples ; %configure --disable-rpath --disable-static --with-ldns=%{buildroot}/lib/ )
+(cd drill ; %configure %subdir_conf_opt --with-ldns=%{buildroot}/lib/ )
+(cd examples ; %configure %subdir_conf_opt --with-ldns=%{buildroot}/lib/ )
 
 make %{?_smp_mflags} 
 ( cd drill ; make %{?_smp_mflags} )
@@ -126,6 +144,11 @@ rm -rf %{buildroot}
 %postun -p /sbin/ldconfig
 
 %changelog
+* Sun Nov 14 2010 IWAI, Masaharu <iwai@alib.jp> 1.6.7-1
+- new upstream release
+- add enable_gost flag: default disable
+- defined subdir_conf_opt rpm macro
+
 * Thu Sep  2 2010 IWAI, Masaharu <iwai@alib.jp> 1.6.6-1
 - new upstream release