rpms/389-ds-base
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Release 1.3.5.1-3

Browse Source 
- Fixed the %if expression for use_nunc_stans.
This commit is contained in:
Noriko Hosoi 2016-04-11 11:50:58 -07:00
parent dc711d1b02
commit 257a3d8b62
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
389-ds-base.spec
View File

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