- Use generic 64 bit detection (fixes aarch64/ppc64le)
- PPC/s390 has lm_sensors - Minor spec cleanups
This commit is contained in:
parent
1e277f6ab3
commit
a997f82bd7
@ -25,7 +25,7 @@
|
|||||||
Summary: 389 Directory Server (base)
|
Summary: 389 Directory Server (base)
|
||||||
Name: 389-ds-base
|
Name: 389-ds-base
|
||||||
Version: 1.3.3.3
|
Version: 1.3.3.3
|
||||||
Release: %{?relprefix}1%{?prerel}%{?dist}
|
Release: %{?relprefix}2%{?prerel}%{?dist}
|
||||||
License: GPLv2 with exceptions
|
License: GPLv2 with exceptions
|
||||||
URL: http://port389.org/
|
URL: http://port389.org/
|
||||||
Group: System Environment/Daemons
|
Group: System Environment/Daemons
|
||||||
@ -55,9 +55,7 @@ BuildRequires: pcre-devel
|
|||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
# The following are needed to build the snmp ldap-agent
|
# The following are needed to build the snmp ldap-agent
|
||||||
BuildRequires: net-snmp-devel
|
BuildRequires: net-snmp-devel
|
||||||
%ifnarch sparc sparc64 ppc ppc64 s390 s390x
|
|
||||||
BuildRequires: lm_sensors-devel
|
BuildRequires: lm_sensors-devel
|
||||||
%endif
|
|
||||||
BuildRequires: bzip2-devel
|
BuildRequires: bzip2-devel
|
||||||
BuildRequires: zlib-devel
|
BuildRequires: zlib-devel
|
||||||
BuildRequires: openssl-devel
|
BuildRequires: openssl-devel
|
||||||
@ -181,7 +179,7 @@ NSSARGS="--with-svrcore-inc=%{_includedir} --with-svrcore-lib=%{_libdir} --with-
|
|||||||
# Generate symbolic info for debuggers
|
# Generate symbolic info for debuggers
|
||||||
export XCFLAGS=$RPM_OPT_FLAGS
|
export XCFLAGS=$RPM_OPT_FLAGS
|
||||||
|
|
||||||
%ifarch x86_64 ppc64 ia64 s390x sparc64
|
%if %{__isa_bits} == 64
|
||||||
export USE_64=1
|
export USE_64=1
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
@ -189,8 +187,6 @@ make %{?_smp_mflags}
|
|||||||
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
rm -rf $RPM_BUILD_ROOT
|
|
||||||
|
|
||||||
make DESTDIR="$RPM_BUILD_ROOT" install
|
make DESTDIR="$RPM_BUILD_ROOT" install
|
||||||
|
|
||||||
mkdir -p $RPM_BUILD_ROOT/var/log/%{pkgname}
|
mkdir -p $RPM_BUILD_ROOT/var/log/%{pkgname}
|
||||||
@ -200,17 +196,13 @@ mkdir -p $RPM_BUILD_ROOT/var/lock/%{pkgname}
|
|||||||
# for systemd
|
# for systemd
|
||||||
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/systemd/system/%{groupname}.wants
|
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/systemd/system/%{groupname}.wants
|
||||||
|
|
||||||
#remove libtool and static libs
|
#remove libtool archives and static libs
|
||||||
rm -f $RPM_BUILD_ROOT%{_libdir}/%{pkgname}/*.a
|
find %{buildroot} -type f -name "*.la" -delete
|
||||||
rm -f $RPM_BUILD_ROOT%{_libdir}/%{pkgname}/*.la
|
find %{buildroot} -type f -name "*.a" -delete
|
||||||
rm -f $RPM_BUILD_ROOT%{_libdir}/%{pkgname}/plugins/*.a
|
|
||||||
rm -f $RPM_BUILD_ROOT%{_libdir}/%{pkgname}/plugins/*.la
|
|
||||||
|
|
||||||
# make sure perl scripts have a proper shebang
|
# make sure perl scripts have a proper shebang
|
||||||
sed -i -e 's|#{{PERL-EXEC}}|#!/usr/bin/perl|' $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/script-templates/template-*.pl
|
sed -i -e 's|#{{PERL-EXEC}}|#!/usr/bin/perl|' $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/script-templates/template-*.pl
|
||||||
|
|
||||||
%clean
|
|
||||||
rm -rf $RPM_BUILD_ROOT
|
|
||||||
|
|
||||||
%post
|
%post
|
||||||
output=/dev/null
|
output=/dev/null
|
||||||
@ -316,6 +308,11 @@ fi
|
|||||||
%{_libdir}/%{pkgname}/libns-dshttpd.so*
|
%{_libdir}/%{pkgname}/libns-dshttpd.so*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sun Sep 14 2014 Peter Robinson <pbrobinson@fedoraproject.org> 1.3.3.3-2
|
||||||
|
- Use generic 64 bit detection (fixes aarch64/ppc64le)
|
||||||
|
- PPC/s390 has lm_sensors
|
||||||
|
- Minor spec cleanups
|
||||||
|
|
||||||
* Fri Sep 12 2014 Rich Megginson <rmeggins@redhat.com> - 1.3.3.3-1
|
* Fri Sep 12 2014 Rich Megginson <rmeggins@redhat.com> - 1.3.3.3-1
|
||||||
- Release 1.3.3.3
|
- Release 1.3.3.3
|
||||||
- Ticket #47892 - coverity defects found in 1.3.3.1
|
- Ticket #47892 - coverity defects found in 1.3.3.1
|
||||||
|
Loading…
Reference in New Issue
Block a user