diff --git a/apache2-mod_perl.changes b/apache2-mod_perl.changes index 024a0aa..4f6687e 100644 --- a/apache2-mod_perl.changes +++ b/apache2-mod_perl.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Feb 13 10:44:11 UTC 2012 - coolo@suse.com + +- patch license to follow spdx.org standard + ------------------------------------------------------------------- Sat Sep 17 11:19:09 UTC 2011 - jengelh@medozas.de diff --git a/apache2-mod_perl.spec b/apache2-mod_perl.spec index 0fb873a..063f85f 100644 --- a/apache2-mod_perl.spec +++ b/apache2-mod_perl.spec @@ -1,7 +1,8 @@ +# vim: ft=apache # # spec file for package apache2-mod_perl # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +20,16 @@ Url: http://perl.apache.org/ Name: apache2-mod_perl -BuildRequires: apache2-devel db-devel ed pcre-devel perl perl-BSD-Resource perl-Compress-Zlib perl-Tie-IxHash perl-libwww-perl sudo +BuildRequires: apache2-devel +BuildRequires: db-devel +BuildRequires: ed +BuildRequires: pcre-devel +BuildRequires: perl +BuildRequires: perl-BSD-Resource +BuildRequires: perl-Compress-Zlib +BuildRequires: perl-Tie-IxHash +BuildRequires: perl-libwww-perl +BuildRequires: sudo %if 0%{sles_version} == 9 BuildRequires: openldap2-devel %endif @@ -31,8 +41,8 @@ BuildRequires: openldap2-devel %define apache_serverroot %(%{apxs} -q PREFIX) %define apache_mmn %(MMN=$(%{apxs} -q LIBEXECDIR)_MMN; test -x $MMN && $MMN) Summary: Embedded Perl for Apache +License: Apache-2.0 Group: Productivity/Networking/Web/Servers -License: ASLv.. Requires: apache2 %{apache_mmn} Requires: perl = %{perl_version} Requires: perl-HTML-Parser perl-Tie-IxHash @@ -40,7 +50,7 @@ Requires: perl-URI perl-libwww-perl Obsoletes: mod_perl_2 Conflicts: mod_perl Version: 2.0.5 -Release: 3 +Release: 0 Source0: http://perl.apache.org/dist/mod_perl-%{version}.tar.gz Patch: %{name}-2.0.4-tests.diff Patch1: nolfs.patch @@ -86,7 +96,6 @@ be placed inside the /srv/www/cgi-bin/ directory. Refer to %package devel -License: ASLv.. Summary: Embedded Perl for Apache - Development package Group: Productivity/Networking/Web/Servers Requires: %{name} = %{version} @@ -244,7 +253,6 @@ cat > $RPM_BUILD_ROOT/%{apache_sysconfdir}/conf.d/mod_perl.conf < # The /cgi-bin/ ScriptAlias is already set up in httpd.conf -# vim: ft=apache EOF # install documentation files alongside perl modules, where applicable %{__cp} -av docs/api/*.pod $RPM_BUILD_ROOT/%{perl_vendorarch}/