- release 1 - works with apache2

[packages/Apache-Gallery.git] / Apache-Gallery.spec

diff --git a/Apache-Gallery.spec b/Apache-Gallery.spec
index 3a6453aec2e1049abb98ac477cf7af001f23a01b..4e8be8a3eeea8db5f577596e79856e1743ddd184 100644 (file)
--- a/Apache-Gallery.spec
+++ b/Apache-Gallery.spec
@@ -1,34 +1,40 @@
 # TODO:
 # - prepare subpackage with virtual
 # - configuration for apache
-# - switch to vendordirs and apache 2.x or apache1 (depending on which mod_perl is supported)
 #
+%bcond_with    tests   # Build with tests
+
 %include       /usr/lib/rpm/macros.perl
 %define        apxs            /usr/sbin/apxs
 Summary:       An Apache module for creating an online gallery
 Summary(pl):   Modu³ Apache'a do tworzenia galerii online
 Name:          Apache-Gallery
-Version:       0.9
-Release:       0.1
+Version:       0.9.1
+Release:       1
 License:       Artistic
 Group:         Applications/Graphics
 Source0:       http://apachegallery.dk/download/%{name}-%{version}.tar.gz
-# Source0-md5: 8ea0e336dff4c3fef6b083159e256a91
+# Source0-md5: 882e650e6fc3f059e84eca1564b5f32f
 #Source1:      %{name}.conf
+Patch0:                %{name}-apache2.patch
 URL:           http://apachegallery.dk/
-BuildRequires: apache-mod_perl
-BuildRequires: perl-Image-Imlib2 >= 1.00
+BuildRequires: apache-mod_perl >= 1.99
+%{?with_tests:BuildRequires:   apache1-mod_perl}
+BuildRequires: perl-CGI >= 2.93
+BuildRequires: perl-Image-Imlib2 >= 1.02
 BuildRequires: perl-Image-Info
 BuildRequires: perl-Image-Size
 BuildRequires: perl-Text-Template
+BuildRequires: perl-URI >= 1.23
 BuildRequires: perl-devel
-BuildRequires: perl-libapreq
+BuildRequires: perl-libapreq2
 BuildRequires: rpm-perlprov >= 3.0.3-16
 Requires:      apache-mod_perl
+Conflicts:     apache-mod_autoindex
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _noautoreq      'perl(APR::Table)' 'perl(Apache2)' 'perl(Apache::Const)' 'perl(Apache::RequestIO)' 'perl(Apache::RequestRec)' 'perl(Apache::SubRequest)'
-%define                _apacheicons    /home/httpd/icons/gallery
+%define                _apacheicons    /home/services/httpd/icons/gallery
 
 %description
 Apache::Gallery is a mod_perl handler that sits on top of your
@@ -46,11 +52,16 @@ przeskalowywane w locie i buforowane.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
-%{__perl} Makefile.PL
-%{__make}
-%{__make} test
+%{__perl} Makefile.PL \
+       INSTALLDIRS=vendor
+
+%{__make} \
+       OPTIMIZE="%{rpmcflags}"
+
+%{?with_tests:%{__make} test}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -83,7 +94,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc Changes INSTALL README TODO UPGRADE
-%{perl_sitelib}/Apache/Gallery.pm
+%{perl_vendorlib}/Apache/Gallery.pm
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/templates
 %dir %{_datadir}/%{name}/templates/new
@@ -92,5 +103,6 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/%{name}/templates/default
 %{_datadir}/%{name}/templates/default/*.tpl
 %{_datadir}/%{name}/templates/default/*.css
+%dir %{_apacheicons}
 %{_apacheicons}/*.png
 %{_mandir}/man3/*.3*