Commit 8301184c authored by Clément OUDOT's avatar Clément OUDOT

Various fix for RPM packaging

git-svn-id: svn://svn.forge.objectweb.org/svnroot/lemonldap/branches/lemonldap-ng_version_1_4-bugfixes@3440 1dbb9719-a921-0410-b57f-c3a383c2c641
parent 8405548a
......@@ -19,7 +19,7 @@ plan tests => $numTests;
my $ini = File::Temp->new();
my $dir = dirname( abs_path($0) );
my $tmp = File::Temp->newdir();
my $tmp = File::Temp::tempdir();
print $ini "[all]
......
......@@ -25,6 +25,8 @@ $ini->flush();
use Env qw(LLNG_DEFAULTCONFFILE);
$LLNG_DEFAULTCONFFILE = $ini->filename;
open STDERR, '>/dev/null';
#########################
# Insert your test code below, the Test::More module is use()ed here so read
......@@ -36,7 +38,7 @@ SKIP: {
"Cache::Memcached is not installed, so Lemonldap::NG::Handler::SecureToken will not be useable",
1
if ($@);
use_ok('Lemonldap::NG::Handler::SecureToken');
use_ok('Lemonldap::NG::Handler::Specific::SecureToken');
}
$LLNG_DEFAULTCONFFILE = undef;
......@@ -93,8 +93,9 @@ BuildRequires: perl(Clone)
BuildRequires: perl(Net::CIDR::Lite)
BuildRequires: perl(Unicode::String)
BuildRequires: perl(Mouse)
BuildRequires: perl(Digest::SHA)
%else
BuildRequires: perl-Regexp-Assemble, perl-Authen-Captcha, perl-Cache-Cache, perl-Apache-Session, perl-LDAP, perl-CGI-Session, perl-IO-String, perl-MIME-Lite, perl-SOAP-Lite, perl-XML-Simple, perl-XML-LibXSLT, perl-String-Random, perl-Email-Date-Format, perl-Crypt-Rijndael, perl-HTML-Template, perl-JSON, perl-Config-IniFiles, perl-Crypt-OpenSSL-RSA, perl-Crypt-OpenSSL-X509, perl-Class-Inspector, perl-Test-MockObject, perl-Clone, perl-Net-CIDR-Lite, perl-Unicode-String, perl-Mouse
BuildRequires: perl-Regexp-Assemble, perl-Authen-Captcha, perl-Cache-Cache, perl-Apache-Session, perl-LDAP, perl-CGI-Session, perl-IO-String, perl-MIME-Lite, perl-SOAP-Lite, perl-XML-Simple, perl-XML-LibXSLT, perl-String-Random, perl-Email-Date-Format, perl-Crypt-Rijndael, perl-HTML-Template, perl-JSON, perl-Config-IniFiles, perl-Crypt-OpenSSL-RSA, perl-Crypt-OpenSSL-X509, perl-Class-Inspector, perl-Test-MockObject, perl-Clone, perl-Net-CIDR-Lite, perl-Unicode-String, perl-Mouse, perl-Digest-SHA
%endif
%if 0%{?rhl}%{?rhel}%{?fedora}
......@@ -337,14 +338,14 @@ rm -rf %{buildroot}
DNSDOMAIN=%{lm_dnsdomain}
# Build FR doc (requires omegat)
%if %{build_fr_doc}
if [ `which omegat` == 0 ]; then
%{__make} %{?_smp_mflags} install_fr_doc_site \
DESTDIR=%{buildroot} \
PREFIX=%{lm_prefix} \
BINDIR=%{lm_sharedir}/bin \
DOCUMENTROOT=%{lm_vardir} \
DATADIR=%{lm_vardir}
%endif
fi
# Remove some unwanted files
find %{buildroot} -name .packlist -exec rm -f {} \;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment