!7 don't support python2 anymore
From: @eaglegai Reviewed-by: @zengwefeng Signed-off-by: @zengwefeng
This commit is contained in:
openeuler-ci-bot
Gitee
commit
eb572d1f6e
57
ldns.spec
57
ldns.spec
@ -1,5 +1,4 @@
|
|||||||
%global _hardened_build 1
|
%global _hardened_build 1
|
||||||
%global with_python2 1
|
|
||||||
%global with_python3 1
|
%global with_python3 1
|
||||||
|
|
||||||
%bcond_without perl
|
%bcond_without perl
|
||||||
@ -12,7 +11,7 @@
|
|||||||
|
|
||||||
%{?!snapshot: %global snapshot 0}
|
%{?!snapshot: %global snapshot 0}
|
||||||
|
|
||||||
%if %{with_python2} || %{with_python3}
|
%if %{with_python3}
|
||||||
%{?filter_setup:
|
%{?filter_setup:
|
||||||
%global _ldns_internal_filter /^_ldns[.]so.*/d;
|
%global _ldns_internal_filter /^_ldns[.]so.*/d;
|
||||||
%filter_from_requires %{_ldns_internal_filter}
|
%filter_from_requires %{_ldns_internal_filter}
|
||||||
@ -30,7 +29,7 @@
|
|||||||
|
|
||||||
Name: ldns
|
Name: ldns
|
||||||
Version: 1.7.0
|
Version: 1.7.0
|
||||||
Release: 26
|
Release: 27
|
||||||
Summary: Low-level DNS(SEC) library with API
|
Summary: Low-level DNS(SEC) library with API
|
||||||
|
|
||||||
License: BSD
|
License: BSD
|
||||||
@ -52,9 +51,6 @@ BuildRequires: openssl-devel >= 1.1.0
|
|||||||
BuildRequires: openssl-devel >= 1.0.2k
|
BuildRequires: openssl-devel >= 1.0.2k
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if %{with_python2}
|
|
||||||
BuildRequires: python2-devel, swig
|
|
||||||
%endif
|
|
||||||
%if %{with_python3}
|
%if %{with_python3}
|
||||||
BuildRequires: python3-devel, swig
|
BuildRequires: python3-devel, swig
|
||||||
%endif
|
%endif
|
||||||
@ -83,17 +79,6 @@ Obsoletes: %{name}-utils
|
|||||||
%{name}-devel contains the header files for developing
|
%{name}-devel contains the header files for developing
|
||||||
applications that want to make use of %{name}.
|
applications that want to make use of %{name}.
|
||||||
|
|
||||||
%if %{with python2}
|
|
||||||
%package -n python2-%{name}
|
|
||||||
Summary: Python2 extensions for %{name}
|
|
||||||
Requires: %{name} = %{version}-%{release}
|
|
||||||
%{?python_provide:%python_provide python2-%{name}}
|
|
||||||
|
|
||||||
%description -n python2-%{name}
|
|
||||||
Python2 packages for %{name}
|
|
||||||
%endif
|
|
||||||
|
|
||||||
|
|
||||||
%if %{with python3}
|
%if %{with python3}
|
||||||
%package -n python3-%{name}
|
%package -n python3-%{name}
|
||||||
Summary: Python3 extensions for %{name}
|
Summary: Python3 extensions for %{name}
|
||||||
@ -153,10 +138,6 @@ popd
|
|||||||
mv %{pkgname} %{pkgname}_python3
|
mv %{pkgname} %{pkgname}_python3
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if %{with python2}
|
|
||||||
cp -a %{pkgname}_python3 %{pkgname}_python2
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
CFLAGS="%{optflags} -fPIC"
|
CFLAGS="%{optflags} -fPIC"
|
||||||
CXXFLAGS="%{optflags} -fPIC"
|
CXXFLAGS="%{optflags} -fPIC"
|
||||||
@ -222,16 +203,6 @@ make %{?_smp_mflags} doc
|
|||||||
sed -i "s~$RPM_LD_FLAGS~~" packaging/ldns-config
|
sed -i "s~$RPM_LD_FLAGS~~" packaging/ldns-config
|
||||||
popd
|
popd
|
||||||
|
|
||||||
%if %{with_python2}
|
|
||||||
pushd %{pkgname}_python2
|
|
||||||
%configure \
|
|
||||||
%{common_args} \
|
|
||||||
--with-pyldns PYTHON=%{__python2}
|
|
||||||
|
|
||||||
make %{?_smp_mflags}
|
|
||||||
popd
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
rm -rf %{buildroot}
|
rm -rf %{buildroot}
|
||||||
|
|
||||||
@ -257,14 +228,6 @@ install -D -m644 packaging/libldns.pc %{buildroot}%{_libdir}/pkgconfig/ldns.pc
|
|||||||
%endif
|
%endif
|
||||||
popd
|
popd
|
||||||
|
|
||||||
%if %{with_python2}
|
|
||||||
pushd %{pkgname}_python2
|
|
||||||
make DESTDIR=%{buildroot} INSTALL="%{__install} -p" install-pyldns install-pyldnsx
|
|
||||||
rm -rf %{buildroot}%{_libdir}/*.la %{buildroot}%{python2_sitearch}/*.la
|
|
||||||
popd
|
|
||||||
%endif
|
|
||||||
|
|
||||||
|
|
||||||
rm doc/*.xml
|
rm doc/*.xml
|
||||||
|
|
||||||
rm doc/doxyparse.pl
|
rm doc/doxyparse.pl
|
||||||
@ -289,13 +252,6 @@ rm -rf doc/man
|
|||||||
%dir %{_includedir}/%{name}
|
%dir %{_includedir}/%{name}
|
||||||
%{_includedir}/%{name}/*.h
|
%{_includedir}/%{name}/*.h
|
||||||
|
|
||||||
%if %{with_python2}
|
|
||||||
%files -n python2-%{name}
|
|
||||||
%defattr(-,root,root)
|
|
||||||
%license LICENSE.ldnsx
|
|
||||||
%{python2_sitearch}/*
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%if %{with_python3}
|
%if %{with_python3}
|
||||||
%files -n python3-ldns
|
%files -n python3-ldns
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
@ -315,9 +271,6 @@ rm -rf doc/man
|
|||||||
%doc doc README Changelog README.git
|
%doc doc README Changelog README.git
|
||||||
%{_mandir}/man1/*
|
%{_mandir}/man1/*
|
||||||
%{_mandir}/man3/*.3.gz
|
%{_mandir}/man3/*.3.gz
|
||||||
%if %{with_python2}
|
|
||||||
%doc %{pkgname}_python2/contrib/python/Changelog README.ldnsx
|
|
||||||
%endif
|
|
||||||
%if %{with_python3}
|
%if %{with_python3}
|
||||||
%doc %{pkgname}_python3/contrib/python/Changelog README.ldnsx
|
%doc %{pkgname}_python3/contrib/python/Changelog README.ldnsx
|
||||||
%endif
|
%endif
|
||||||
@ -326,6 +279,12 @@ rm -rf doc/man
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Oct 29 2020 gaihuiying <gaihuiying1@huawei.com> - 1.7.0-27
|
||||||
|
- Type:rquirement
|
||||||
|
- ID:NA
|
||||||
|
- SUG:NA
|
||||||
|
- DESC:remove python2, don't support python2 anymore
|
||||||
|
|
||||||
* Mon Aug 03 2020 gaihuiying <gaihuiying1@huawei.com> - 1.7.0-26
|
* Mon Aug 03 2020 gaihuiying <gaihuiying1@huawei.com> - 1.7.0-26
|
||||||
- Type:bugfix
|
- Type:bugfix
|
||||||
- ID:NA
|
- ID:NA
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user