diff --git a/fixmakefile.patch b/fixmakefile.patch new file mode 100644 index 0000000..f356fed --- /dev/null +++ b/fixmakefile.patch @@ -0,0 +1,26 @@ +Index: perl-Apache-AuthNetLDAP-0.29/Apache-AuthNetLDAP-0.29/Makefile.PL +=================================================================== +--- perl-Apache-AuthNetLDAP-0.29.orig/Apache-AuthNetLDAP-0.29/Makefile.PL ++++ perl-Apache-AuthNetLDAP-0.29/Apache-AuthNetLDAP-0.29/Makefile.PL +@@ -2,7 +2,7 @@ + # ExtUtils::AutoInstall Bootstrap Code, version 7. + BEGIN{my$p='ExtUtils::AutoInstall';my$v=0.52;$p->VERSION||0>=$v + or+eval"use $p $v;1"or+do{my$e=$ENV{PERL_EXTUTILS_AUTOINSTALL}; +- (!defined($e)||$e!~m/--(?:default|skip|testonly)/and-t STDIN or ++ (!defined($e)||$e!~m/--(?:default|skip|testonly)/ and -t STDIN or + eval"use ExtUtils::MakeMaker;WriteMakefile(PREREQ_PM=>{'$p',$v} + );1"and exit)and print"==> $p $v required. Install it from CP". + "AN? [Y/n] "and!~/^n/i and print"*** Installing $p\n"and +Index: perl-Apache-AuthNetLDAP-0.29/Apache-AuthzNetLDAP-0.07/Makefile.PL +=================================================================== +--- perl-Apache-AuthNetLDAP-0.29.orig/Apache-AuthzNetLDAP-0.07/Makefile.PL ++++ perl-Apache-AuthNetLDAP-0.29/Apache-AuthzNetLDAP-0.07/Makefile.PL +@@ -2,7 +2,7 @@ + # ExtUtils::AutoInstall Bootstrap Code, version 7. + BEGIN{my$p='ExtUtils::AutoInstall';my$v=0.52;$p->VERSION||0>=$v + or+eval"use $p $v;1"or+do{my$e=$ENV{PERL_EXTUTILS_AUTOINSTALL}; +- (!defined($e)||$e!~m/--(?:default|skip|testonly)/and-t STDIN or ++ (!defined($e)||$e!~m/--(?:default|skip|testonly)/ and -t STDIN or + eval"use ExtUtils::MakeMaker;WriteMakefile(PREREQ_PM=>{'$p',$v} + );1"and exit)and print"==> $p $v required. Install it from CP". + "AN? [Y/n] "and!~/^n/i and print"*** Installing $p\n"and diff --git a/perl-Apache-AuthNetLDAP.changes b/perl-Apache-AuthNetLDAP.changes index c0b8a8a..63003ec 100644 --- a/perl-Apache-AuthNetLDAP.changes +++ b/perl-Apache-AuthNetLDAP.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jan 15 13:57:26 UTC 2016 - bwiedemann@suse.com + +- add fixmakefile.patch to fix build + ------------------------------------------------------------------- Fri Nov 18 11:09:59 UTC 2011 - coolo@suse.com diff --git a/perl-Apache-AuthNetLDAP.spec b/perl-Apache-AuthNetLDAP.spec index 55ae4c8..c775272 100644 --- a/perl-Apache-AuthNetLDAP.spec +++ b/perl-Apache-AuthNetLDAP.spec @@ -1,7 +1,7 @@ # # spec file for package perl-Apache-AuthNetLDAP # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,29 +15,34 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: perl-Apache-AuthNetLDAP %define cpan_name Apache-AuthNetLDAP -BuildRequires: apache2-devel apache2-mod_perl libapr-util1-devel pcre-devel perl-ldap +BuildRequires: apache2-devel +BuildRequires: apache2-mod_perl +BuildRequires: libapr-util1-devel +BuildRequires: pcre-devel +BuildRequires: perl-ldap BuildRequires: perl-macros Version: 0.29 -Release: 229 +Release: 0 %define zver 0.07 Provides: Apache-AuthNetLDAP Requires: apache2 -Requires: apache2-mod_perl perl-ldap perl-Convert-ASN1 perl-URI +Requires: apache2-mod_perl +Requires: perl-Convert-ASN1 +Requires: perl-URI +Requires: perl-ldap Conflicts: perlmod -AutoReqProv: on +Url: https://metacpan.org/pod/Apache::AuthNetLDAP +Summary: User authentication in Apache with Net::LDAP +License: Artistic-1.0 Group: Development/Libraries/Perl -License: Artistic -Url: http://cpan.org/modules/by-module/Apache/ -Summary: use Net::LDAP for user authentication in Apache Source0: Apache-AuthNetLDAP-%{version}.tar.gz Source1: Apache-AuthzNetLDAP-%{zver}.tar.bz2 Patch0: Apache-AuthNetLDAP-%{version}-apache2.diff Patch10: Apache-AuthzNetLDAP-%{zver}-apache2.diff +Patch11: fixmakefile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %{perl_requires} @@ -58,8 +63,10 @@ Authors: %setup -n %{name}-%{version} -q -b0 -b1 -c %patch0 %patch10 +%patch11 -p1 %build +# MANUAL for i in Apache-AuthNetLDAP-%{version} Apache-AuthzNetLDAP-%{zver} ; do cd $i install -d -m755 lib/Apache @@ -68,10 +75,17 @@ for i in Apache-AuthNetLDAP-%{version} Apache-AuthzNetLDAP-%{zver} ; do mv MANIFEST.tmp MANIFEST perl Makefile.PL make %{?_smp_mflags} - make test cd - done +%check +# MANUAL +for i in Apache-AuthNetLDAP-%{version} Apache-AuthzNetLDAP-%{zver} ; do + cd $i + make test + cd - +done + %install rm -rf $RPM_BUILD_ROOT for i in Apache-AuthNetLDAP-%{version} Apache-AuthzNetLDAP-%{zver} ; do