Browse Source

ldns-1.7.1-1

Tomohiro "Tomo-p" KATO 4 years ago
parent
commit
0895ffa164
1 changed files with 18 additions and 17 deletions
  1. 18 17
      l/ldns/ldns-vl.spec

+ 18 - 17
l/ldns/ldns-vl.spec

@@ -1,11 +1,6 @@
 %{?!with_python:      %global with_python      1}
-%{?!enable_gost:      %global enable_gost      0}
-%{?!enable_dane:      %global enable_dane      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
+%{?!enable_gost:      %global enable_gost      1}
+%{?!enable_dane:      %global enable_dane      1}
 
 %if %{enable_gost}
 %define	subdir_conf_opt --disable-rpath --disable-static
@@ -17,11 +12,11 @@
 Summary: Lowlevel DNS(SEC) library with API
 Summary(ja): 低レベルな DNS(SEC) ライブラリと API
 Name: ldns
-Version: 1.7.0
-Release: 2%{?_dist_release}
+Version: 1.7.1
+Release: 1%{?_dist_release}
 License: BSD
 Url: http://www.nlnetlabs.nl/%{name}/
-Source: http://www.nlnetlabs.nl/downloads/%{name}-%{version}.tar.gz
+Source: https://www.nlnetlabs.nl/downloads/ldns/%{name}-%{version}.tar.gz
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: libtool, autoconf, automake, gcc-c++, doxygen,
@@ -31,6 +26,9 @@ BuildRequires: openssl-devel >= 1.0.0
 %else
 BuildRequires: openssl-devel
 %endif
+%if %{with_python}
+BuildRequires: python-rpm-macros
+%endif
 
 Requires: libpcap, openssl
 
@@ -83,18 +81,19 @@ Python extensions for ldns
 %endif
  --with-sha2
 
-(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} )
-( cd examples ; make %{?_smp_mflags} )
+make %{?_smp_mflags} drill
+make %{?_smp_mflags} examples
 make %{?_smp_mflags} doc
 
 %install
 rm -rf %{buildroot}
 
+mkdir -p %{buildroot}%{_libdir}/pkgconfig
+
 make DESTDIR=%{buildroot} INSTALL="%{__install} -p" install 
+make DESTDIR=%{buildroot} INSTALL="%{__install} -p" install-drill
+make DESTDIR=%{buildroot} INSTALL="%{__install} -p" install-examples
 make DESTDIR=%{buildroot} INSTALL="%{__install} -p" install-doc
 
 %if %{with_python}
@@ -111,8 +110,6 @@ rm -rf doc/man
 
 # remove .la files
 rm -rf %{buildroot}%{_libdir}/*.la %{buildroot}%{python_sitearch}/*.la
-(cd drill ; make DESTDIR=%{buildroot} install)
-(cd examples; make DESTDIR=%{buildroot} install)
 
 %clean
 rm -rf %{buildroot}
@@ -133,6 +130,7 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %{_libdir}/libldns*so
 %{_bindir}/ldns-config
+%{_libdir}/pkgconfig/*.pc
 %dir %{_includedir}/ldns
 %{_includedir}/ldns/*.h
 %doc doc Changelog README
@@ -148,6 +146,9 @@ rm -rf %{buildroot}
 %postun -p /sbin/ldconfig
 
 %changelog
+* Sat Aug 24 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.7.1-1
+- updated to 1.7.1.
+
 * Sun Nov 04 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.7.0-2
 - rebuilt with openssl-1.1.1.