Release 1.3.5.1-3
- Fixed the %if expression for use_nunc_stans.
This commit is contained in:
parent
dc711d1b02
commit
257a3d8b62
@ -19,7 +19,7 @@
|
||||
%global use_nunc_stans 0
|
||||
%endif
|
||||
|
||||
%if 0%{?use_nunc_stans:1}
|
||||
%if %{use_nunc_stans}
|
||||
%global nunc_stans_ver 0.1.8
|
||||
%endif
|
||||
|
||||
@ -36,7 +36,7 @@
|
||||
Summary: 389 Directory Server (base)
|
||||
Name: 389-ds-base
|
||||
Version: 1.3.5.1
|
||||
Release: %{?relprefix}2%{?prerel}%{?dist}
|
||||
Release: %{?relprefix}3%{?prerel}%{?dist}
|
||||
License: GPLv3+
|
||||
URL: https://port389.org/
|
||||
Group: System Environment/Daemons
|
||||
@ -130,7 +130,7 @@ Source0: http://port389.org/binaries/%{name}-%{version}%{?prerel}.tar.b
|
||||
# 389-ds-git.sh should be used to generate the source tarball from git
|
||||
Source1: %{name}-git.sh
|
||||
Source2: %{name}-devel.README
|
||||
%if 0%{?use_nunc_stans:1}
|
||||
%if %{use_nunc_stans}
|
||||
Source3: https://git.fedorahosted.org/cgit/nunc-stans.git/snapshot/nunc-stans-%{nunc_stans_ver}.tar.bz2
|
||||
%endif
|
||||
|
||||
@ -157,7 +157,7 @@ BuildRequires: libdb-devel
|
||||
BuildRequires: cyrus-sasl-devel
|
||||
BuildRequires: libicu-devel
|
||||
BuildRequires: pcre-devel
|
||||
%if 0%{?use_nunc_stans:1}
|
||||
%if %{use_nunc_stans}
|
||||
BuildRequires: libtalloc-devel
|
||||
BuildRequires: libevent-devel
|
||||
BuildRequires: libtevent-devel
|
||||
@ -182,7 +182,7 @@ Requires: openldap-devel
|
||||
%else
|
||||
Requires: mozldap-devel
|
||||
%endif
|
||||
%if 0%{?use_nunc_stans:1}
|
||||
%if %{use_nunc_stans}
|
||||
Requires: libtalloc
|
||||
Requires: libevent
|
||||
Requires: libtevent
|
||||
@ -194,7 +194,7 @@ Development Libraries and headers for the 389 Directory Server base package.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{version}%{?prerel}
|
||||
%if 0%{?use_nunc_stans:1}
|
||||
%if %{use_nunc_stans}
|
||||
%setup -q -n %{name}-%{version}%{?prerel} -T -D -b 3
|
||||
%endif
|
||||
cp %{SOURCE2} README.devel
|
||||
@ -204,7 +204,7 @@ cp %{SOURCE2} README.devel
|
||||
sed -r -i '1s|^#!\s*/usr/bin.*python.*|#!%{__python3}|' ldap/admin/src/scripts/*.py
|
||||
|
||||
%build
|
||||
%if 0%{?use_nunc_stans:1}
|
||||
%if %{use_nunc_stans}
|
||||
pushd ../nunc-stans-%{nunc_stans_ver}
|
||||
%configure --with-fhs --libdir=%{_libdir}/%{pkgname}
|
||||
make %{?_smp_mflags}
|
||||
@ -238,7 +238,7 @@ make %{?_smp_mflags}
|
||||
|
||||
|
||||
%install
|
||||
%if 0%{?use_nunc_stans:1}
|
||||
%if %{use_nunc_stans}
|
||||
pushd ../nunc-stans-%{nunc_stans_ver}
|
||||
make DESTDIR="$RPM_BUILD_ROOT" install
|
||||
rm -rf $RPM_BUILD_ROOT%{_includedir} $RPM_BUILD_ROOT%{_datadir} \
|
||||
@ -387,7 +387,7 @@ fi
|
||||
%doc LICENSE LICENSE.GPLv3+ LICENSE.openssl README.devel
|
||||
%{_includedir}/%{pkgname}
|
||||
%{_libdir}/%{pkgname}/libslapd.so
|
||||
%if 0%{?use_nunc_stans:1}
|
||||
%if %{use_nunc_stans}
|
||||
%{_libdir}/%{pkgname}/libnunc-stans.so
|
||||
%endif
|
||||
%{_libdir}/pkgconfig/*
|
||||
@ -398,18 +398,22 @@ fi
|
||||
%dir %{_libdir}/%{pkgname}
|
||||
%{_libdir}/%{pkgname}/libslapd.so.*
|
||||
%{_libdir}/%{pkgname}/libns-dshttpd.so*
|
||||
%if 0%{?use_nunc_stans:1}
|
||||
%if %{use_nunc_stans}
|
||||
%{_libdir}/%{pkgname}/libnunc-stans.so*
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Mon Apr 11 2016 Noriko Hosoi <nhosoi@redhat.com> - 1.3.5.1-3
|
||||
- Release 1.3.5.1-3
|
||||
- Fixed the %if expression for use_nunc_stans.
|
||||
|
||||
* Mon Mar 28 2016 Noriko Hosoi <nhosoi@redhat.com> - 1.3.5.1-2
|
||||
- Release 1.3.5.2
|
||||
- Release 1.3.5.1-2
|
||||
- Fixed License to GPLv3+
|
||||
- Generate a user dirsrv in the package install.
|
||||
|
||||
* Wed Mar 23 2016 Noriko Hosoi <nhosoi@redhat.com> - 1.3.5.1-1
|
||||
- Release 1.3.5.1
|
||||
- Release 1.3.5.1-1
|
||||
- Ticket 47982 - improve timestamp resolution in logs
|
||||
- Ticket 48759 - no plugin calls in tombstone purging
|
||||
- Ticket 48665 - Prevent sefault in ldbm_instance_modify_config_entry
|
||||
|
Loading…
Reference in New Issue
Block a user