Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/perl-LDAP.git#dc55678eae0d0813827a6cb8dbbf9a266f061089
This commit is contained in:
DistroBaker 2021-01-05 10:57:09 +00:00
parent 43ce2179cb
commit b15ffaba0f
4 changed files with 15 additions and 40 deletions

1
.gitignore vendored
View File

@ -20,3 +20,4 @@ perl-ldap-0.40.tar.gz
/perl-ldap-0.64.tar.gz
/perl-ldap-0.65.tar.gz
/perl-ldap-0.66.tar.gz
/perl-ldap-0.68.tar.gz

View File

@ -8,8 +8,8 @@
%endif
Name: perl-LDAP
Version: 0.66
Release: 9%{?dist}
Version: 0.68
Release: 1%{?dist}
Epoch: 1
Summary: LDAP Perl module
License: GPL+ or Artistic
@ -19,12 +19,11 @@ Source0: https://cpan.metacpan.org/authors/id/M/MA/MARSCHAP/perl-ldap-%{v
Patch0: perl-ldap-0.65-Configure-usr-sbin-slapd-for-tests.patch
# Remove an unreliable cancelling test
Patch1: perl-ldap-0.66-test-Remove-a-test-for-cancelling-asynchronous-calls.patch
# Fix a shell bang in a certificate generator script,
# <https://github.com/perl-ldap/perl-ldap/pull/55>
Patch2: perl-ldap-0.66-Correct-a-shell-bang-in-data-regenerate_cert.sh.patch
BuildArch: noarch
BuildRequires: perl-interpreter
BuildRequires: coreutils
BuildRequires: make
BuildRequires: perl-generators
BuildRequires: perl-interpreter
BuildRequires: perl(inc::Module::Install)
BuildRequires: perl(Module::Install::AutoInstall)
BuildRequires: perl(Module::Install::Metadata)
@ -165,26 +164,24 @@ Tests from %{name}-%{version}. Execute them with "%{_libexecdir}/%{name}/test".
%setup -q -n perl-ldap-%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1
chmod -c 644 bin/* contrib/* lib/Net/LDAP/DSML.pm
perl -pi -e 's|^#!/usr/local/bin/perl\b|#!%{__perl}|' contrib/*
# Remove bundled libraries
rm -rf inc
sed -i -e '/^inc\// d' MANIFEST
perl -i -ne 'print $_ unless m{^inc/}' MANIFEST
# Remove tests specific for XML support if the support is disabled
%if !%{with perl_LDAP_enables_xml}
rm t/05dsml.t
sed -i -e '/^t\/05dsml\.t/ d' MANIFEST
perl -i -ne 'print $_ unless m{^t/05dsml\.t}' MANIFEST
%endif
find -type f \! -name 'regenerate_cert.sh' -exec chmod -x {} +
%build
perl Makefile.PL INSTALLDIRS=vendor < /dev/null
make %{?_smp_mflags}
perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1 < /dev/null
%{make_build}
%install
make pure_install DESTDIR=%{buildroot}
find %{buildroot} -type f -name .packlist -delete
%{make_install}
mkdir -p %{buildroot}/%{_libexecdir}/%{name}
# FIXME: Generators should scan these non-executable files
cp -a data t test.cfg %{buildroot}/%{_libexecdir}/%{name}
@ -226,6 +223,9 @@ make test
%{_libexecdir}/%{name}
%changelog
* Tue Jan 05 2021 Jitka Plesnikova <jplesnik@redhat.com> - 1:0.68-1
- 0.68 bump
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.66-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

View File

@ -1,26 +0,0 @@
From 4e63491c2a9ba2d9e9f5ad22360051038918c19d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
Date: Tue, 29 Oct 2019 14:49:09 +0100
Subject: [PATCH] Correct a shell bang in data/regenerate_cert.sh
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Petr Písař <ppisar@redhat.com>
---
data/regenerate_cert.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/data/regenerate_cert.sh b/data/regenerate_cert.sh
index 9bf1879..8980fbe 100755
--- a/data/regenerate_cert.sh
+++ b/data/regenerate_cert.sh
@@ -1,4 +1,4 @@
-#/bin/sh
+#!/bin/sh
# regenerate server certificate for the SSL tests
if [ -e openssl.cnf ]; then
--
2.21.0

View File

@ -1 +1 @@
SHA512 (perl-ldap-0.66.tar.gz) = 58b066a73cbab6f9c709105a01d8bc04128dc52e3b10f6c99b4d4bb8fdb574a6471211a21416dbd06760b7c585e0a340920467b6805a3cc475f00ef27d084b2a
SHA512 (perl-ldap-0.68.tar.gz) = 9b6260ac997c3279585745571f7d825aac956f157aef5715f13efb118723379aa9c838fdc123e2932047b28b38ebc2261ebe82ae1ef6a1f383b775d748ff18c6