-# TODO:
-# - prepare subpackage with virtual
-# - configuration for apache
-# - switch to vendordirs and apache 2.x or apache1 (depending on which mod_perl is supported)
+#
+# Conditional build:
+%bcond_with tests # perform "make test" during build
#
%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.8
-Release: 0.6
+Version: 0.9.1
+Release: 2
License: Artistic
Group: Applications/Graphics
Source0: http://apachegallery.dk/download/%{name}-%{version}.tar.gz
-# Source0-md5: 21ec1b8b11240dc6e3dbba19c6330120
-#Source1: %{name}.conf
+# 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 _appdir %{_datadir}/%{name}
+%define _apacheicons %{_appdir}/icons
%description
Apache::Gallery is a mod_perl handler that sits on top of your
%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
-install -d $RPM_BUILD_ROOT{%{_datadir}/%{name}/templates/{new,default},%{_apacheicons}}
+install -d $RPM_BUILD_ROOT{%{_appdir}/templates/{new,default},%{_apacheicons},/etc/httpd/httpd.conf}
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-install templates/new/*.{css,tpl} $RPM_BUILD_ROOT%{_datadir}/%{name}/templates/new/
-install templates/default/*.{css,tpl} $RPM_BUILD_ROOT%{_datadir}/%{name}/templates/default/
+install templates/new/*.{css,tpl} $RPM_BUILD_ROOT%{_appdir}/templates/new/
+install templates/default/*.{css,tpl} $RPM_BUILD_ROOT%{_appdir}/templates/default/
install htdocs/*.png $RPM_BUILD_ROOT%{_apacheicons}
+install %{SOURCE1} $RPM_BUILD_ROOT/etc/httpd/httpd.conf/09_%{name}.conf
+
%clean
rm -rf $RPM_BUILD_ROOT
-#%post
-#if [ -f /var/lock/subsys/httpd ]; then
-# /etc/rc.d/init.d/httpd restart 1>&2
-#else
-# echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache http daemon."
-#fi
+%post
+if [ -f /var/lock/subsys/httpd ]; then
+ /etc/rc.d/init.d/httpd reload 1>&2
+else
+ echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache HTTP daemon."
+fi
-#%preun
-#if [ "$1" = "0" ]; then
-# if [ -f /var/lock/subsys/httpd ]; then
-# /etc/rc.d/init.d/httpd restart 1>&2
-# fi
-#fi
+%preun
+if [ "$1" = "0" ]; then
+ if [ -f /var/lock/subsys/httpd ]; then
+ /etc/rc.d/init.d/httpd reload 1>&2
+ fi
+fi
%files
%defattr(644,root,root,755)
%doc Changes INSTALL README TODO UPGRADE
-%{perl_sitelib}/Apache/Gallery.pm
-%dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/templates
-%dir %{_datadir}/%{name}/templates/new
-%{_datadir}/%{name}/templates/new/*.tpl
-%{_datadir}/%{name}/templates/new/*.css
-%dir %{_datadir}/%{name}/templates/default
-%{_datadir}/%{name}/templates/default/*.tpl
-%{_datadir}/%{name}/templates/default/*.css
+%attr(640,root,http) %config(noreplace) %verify(not size mtime md5) /etc/httpd/httpd.conf/*%{name}.conf
+%{perl_vendorlib}/Apache/Gallery.pm
+%dir %{_appdir}
+%dir %{_appdir}/templates
+%dir %{_appdir}/templates/new
+%{_appdir}/templates/new/*.tpl
+%{_appdir}/templates/new/*.css
+%dir %{_appdir}/templates/default
+%{_appdir}/templates/default/*.tpl
+%{_appdir}/templates/default/*.css
+%dir %{_apacheicons}
%{_apacheicons}/*.png
%{_mandir}/man3/*.3*