rpm/bugzilla
SHA256
1
0
Fork 0
forked from pool/bugzilla
Code Pull Requests Activity

Accepting request 855565 from home:ecsos:server

Browse Source 
- Use apache-rpm-macros.
- Put apache configuration files in separate subpackage.
- Remove %service_add_post and %server_del_postun apache2.service
  from spec.
- Fix two rpmlint errors.

OBS-URL: https://build.opensuse.org/request/show/855565
OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm/bugzilla?expand=0&rev=22
This commit is contained in:
Eric Schirra 2020-12-13 12:08:34 +00:00 committed by Git OBS Bridge
parent afca45dd64
commit b48c9bbed7
3 changed files with 42 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bugzilla.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Sun Dec 13 11:12:55 UTC 2020 - ecsos <ecsos@opensuse.org>
- Use apache-rpm-macros.
- Put apache configuration files in separate subpackage.
- Remove %service_add_post and %server_del_postun apache2.service
from spec.
- Fix two rpmlint errors.
-------------------------------------------------------------------
Mon Feb 3 12:04:12 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>

4
bugzilla.conf
View File

@ -1,6 +1,6 @@
Alias /bugzilla "/srv/www/bugzilla/"
Alias /bugzilla "@APACHE_SERVERROOT@/bugzilla/"
<Directory "/srv/www/bugzilla">
<Directory "@APACHE_SERVERROOT@/bugzilla">
AddHandler cgi-script .cgi
Options +ExecCGI +FollowSymLinks

51
bugzilla.spec
View File

@ -29,12 +29,9 @@ Source3: MPL-2.0.html
Source4: %{name}.conf
Source5: %{name}-rpmlintrc
Patch1: fix_whine_error.patch
BuildRequires: apache
BuildRequires: apache-rpm-macros
BuildRequires: fdupes
BuildRequires: pkgconfig(systemd)
Requires: apache
Requires: apache2-mod_perl >= 1.999022
#Recommonds: Apache-SizeLimit
Requires: patchutils
Requires: perl-Authen-SASL
#Recommends: RadiusPerl
@ -112,9 +109,25 @@ Requires: %{name} = %{version}-%{release}
%description lang-de
This package includes german language files for bugzilla
%package apache
Summary: Apache configuration for %{name}
Group: Productivity/Networking/Web/Utilities
BuildRequires: apache2
Requires: apache2
Requires: apache2-mod_perl >= 1.999022
#Recommonds: Apache-SizeLimit
Supplements: packageand(apache2:%name)
%description apache
This subpackage contains the Apache configuration files
%prep
%setup -q
%patch1 -p1
# rpmlint
sed -i -e 's|\/usr\/bin\/env python|\/usr\/bin\/python|g' contrib/bugzilla-submit/bugzilla-submit
sed -i -e 's|\/usr\/bin\/env perl|\/usr\/bin\/perl|g' contrib/perl-fmt
#
tar -xzf %{SOURCE2} --directory "template"
cd template/de
cd ../..
@ -142,33 +155,31 @@ find . -type f "(" -name ".git*" -o -name ".bzr*" -o -name ".travis*" -o -name "
find . -type f -print0 | xargs -0r grep -l '^#!' | xargs -r chmod a+x
find . -type f -print0 | xargs -0r grep -l '^#!' | \
xargs -r perl -i -pe 's{^#!%{_prefix}/local/}{#!%{_prefix}/}' "{}" "+"
mkdir -p "%{buildroot}/srv/www"
cp -a . "%{buildroot}/srv/www/%{name}"
mkdir -p "%{buildroot}%{apache_serverroot}"
cp -a . "%{buildroot}%{apache_serverroot}/%{name}"
%fdupes %{buildroot}/srv
cp "%{SOURCE3}" .
#install bugzilla.conf to apache conf.d
install -D -m0640 %{SOURCE4} %{buildroot}%{_sysconfdir}/apache2/conf.d/bugzilla.conf
install -D -m0640 %{SOURCE4} %{buildroot}%{apache_sysconfdir}/conf.d/bugzilla.conf
# fix apache serverroot
sed -i -e 's|@APACHE_SERVERROOT@|%{apache_serverroot}|g' %{buildroot}%{apache_sysconfdir}/conf.d/bugzilla.conf
# remove included .htaccess which has been moved to bugzilla.conf
rm %{buildroot}/srv/www/bugzilla/.htaccess
%post
%service_add_post apache2.service
%postun
%service_del_postun apache2.service
rm %{buildroot}%{apache_serverroot}/%{name}/.htaccess
%files
%doc MPL-2.0.html
%defattr(-,wwwrun,root)
%defattr(-,%{apache_user},root)
# exclude language de_DE
%exclude /srv/www/bugzilla/template/de
%config(noreplace) %{_sysconfdir}/apache2/conf.d/bugzilla.conf
/srv/www/bugzilla
%exclude %{apache_serverroot}/bugzilla/template/de
%{apache_serverroot}/bugzilla
%files lang-de
%defattr(0644,wwwrun,root,755)
/srv/www/bugzilla/template/de
%defattr(0644,%{apache_user},root,755)
%{apache_serverroot}/bugzilla/template/de
%files apache
%attr(-,%{apache_user},%{apache_group}) %config(noreplace) %{apache_sysconfdir}/conf.d/bugzilla.conf
%changelog