- 2.22

Changed files:
    bugzilla.spec -> 1.22

diff --git a/bugzilla.spec b/bugzilla.spec
index 292bdac1a4e4a967bf12c6fb7e307f9a19e5c16a..ce23618d1e78d0b200716c07765069a48833afbd 100644 (file)
--- a/bugzilla.spec
+++ b/bugzilla.spec
@@ -5,12 +5,12 @@
 Summary:       Bug tracking system
 Summary(pl):   System ¶ledzenia b³êdów
 Name:          bugzilla
-Version:       2.20.1
+Version:       2.22
 Release:       0.1
 License:       GPL
 Group:         Applications/WWW
 Source0:       http://ftp.mozilla.org/pub/mozilla.org/webtools/%{name}-%{version}.tar.gz
-# Source0-md5: b9c74195ce0f446be40b3e81104b934d
+# Source0-md5: bbf2f1ec5607978d39855df104231973
 Source1:       %{name}.conf
 Patch0:                %{name}-httpd_user.patch
 Patch1:                %{name}-chdir.patch
@@ -27,8 +27,8 @@ BuildRoot:    %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                _webapp         %{name}
 %define                _sysconfdir     %{_webapps}/%{_webapp}
 %define                _appdir         %{_datadir}/%{_webapp}
-# see TODO
-%define                _noautoreq              'perl(DBD::Pg)'
+# Don't enforce DBD driver and exclude optional packages according to release notes
+%define                _noautoreq              'perl(DBD::*)' perl(Chart::Base) perl(GD) perl(GD::Graph) perl(GD::Text::Align) perl(Net::LDAP) perl(PatchReader) perl(XML::Twig) perl(Image::Magick)
 
 %description
 Bugzilla is the Bug-Tracking System from the Mozilla project.
@@ -48,12 +48,14 @@ find '(' -name '*~' -o -name '*.orig' -o -name '.cvsignore' ')' | xargs -r rm -v
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_appdir}/Bugzilla,/var/lib/%{name}/{data,graphs}}
 
-install *.{cgi,html,jpg,js,pl,pm,txt,dtd,xul} $RPM_BUILD_ROOT%{_appdir}
+install *.{cgi,js,pl,pm,txt,dtd,xul} $RPM_BUILD_ROOT%{_appdir}
 cp -a Bugzilla $RPM_BUILD_ROOT%{_appdir}
 cp -a images js skins template $RPM_BUILD_ROOT%{_appdir}
 
 ln -s /var/lib/%{name}/data $RPM_BUILD_ROOT%{_appdir}
 ln -s /var/lib/%{name}/graphs $RPM_BUILD_ROOT%{_appdir}
+mv $RPM_BUILD_ROOT%{_appdir}/globals.pl $RPM_BUILD_ROOT%{_sysconfdir}
+ln -s %{_sysconfdir}/globals.pl $RPM_BUILD_ROOT%{_appdir}/globals.pl
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
 install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
@@ -75,11 +77,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc QUICKSTART README UPGRADING UPGRADING-pre-2.8 docs/rel_notes.txt docs/txt/Bugzilla-Guide.txt
+%doc QUICKSTART README UPGRADING* docs/rel_notes.txt docs/txt/Bugzilla-Guide.txt
 %doc contrib docs/html
 %dir %attr(750,root,http) %{_sysconfdir}
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apache.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf
+%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*.pl
 
 %dir %{_appdir}
 %{_appdir}/Bugzilla
@@ -89,16 +92,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_appdir}/js
 %{_appdir}/skins
 %{_appdir}/template
-%attr(755,root,root) %{_appdir}/*.cgi
-%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_appdir}/globals.pl
-%{_appdir}/[!g]*.pl
+%{_appdir}/*.pl
 %{_appdir}/*.dtd
-%{_appdir}/*.html
 %{_appdir}/*.js
-%{_appdir}/*.jpg
 %{_appdir}/*.pm
 %{_appdir}/*.txt
 %{_appdir}/*.xul
+%attr(755,root,root) %{_appdir}/*.cgi
 %dir /var/lib/%{name}
 %attr(770,root,http) /var/lib/%{name}/data
 %attr(775,root,http) /var/lib/%{name}/graphs