From fefbbd93fc0e8869000a6e4f36874e0ecf97d45a Mon Sep 17 00:00:00 2001
From: Emmanuel Seyman <emman...@seyman.fr>
Date: Mon, 18 Jul 2016 11:12:02 +0200
Subject: Add more build-requires && filter out optional modules Check for
 perl(JSON::RPC::Legacy::Server::CGI) instead of perl(JSON::RPC) Update to
 5.0.3, dropping backported patch

---
 bugzilla-dnf.patch | 13 +++++++++++--
 bugzilla.spec      | 47 +++++++++++++++++++++++++++++++++++++++++++----
 2 files changed, 54 insertions(+), 6 deletions(-)

diff --git a/bugzilla-dnf.patch b/bugzilla-dnf.patch
index 78c1d18..8824d21 100644
--- a/bugzilla-dnf.patch
+++ b/bugzilla-dnf.patch
@@ -1,5 +1,14 @@
---- bugzilla-4.01/Bugzilla/Install/Requirements.pm     2011-05-01 
17:09:35.000000000 +0200
-+++ bugzilla-4.01-yum/Bugzilla/Install/Requirements.pm 2011-05-01 
17:11:28.000000000 +0200
+--- bugzilla-5.0.3/Bugzilla/Install/Requirements.pm.orig       2016-11-13 
11:03:43.977035344 +0100
++++ bugzilla-5.0.3/Bugzilla/Install/Requirements.pm    2016-11-13 
11:16:26.115320528 +0100
+@@ -304,7 +304,7 @@ sub OPTIONAL_MODULES {
+     },
+     {
+         package => 'JSON-RPC',
+-        module  => 'JSON::RPC',
++        module  => 'JSON::RPC::Legacy::Server::CGI',
+         version => 0,
+         feature => ['jsonrpc', 'rest'],
+     },
 @@ -648,7 +648,7 @@
      if ($output && $check_results->{any_missing} && !ON_ACTIVESTATE
          && !$check_results->{hide_all}) 
diff --git a/bugzilla.spec b/bugzilla.spec
index fcc7b20..d43f4bd 100644
--- a/bugzilla.spec
+++ b/bugzilla.spec
@@ -6,7 +6,7 @@ URL: https://www.bugzilla.org/
 Name: bugzilla
 Version: 5.0.3
 Group: Applications/Publishing
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MPLv1.1
 Source0: 
https://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz
 Source1: bugzilla-httpd-conf
@@ -42,12 +42,16 @@ BuildRequires: python-sphinx
 BuildRequires: texlive-collection-fontsrecommended
 BuildRequires: texlive-collection-latexrecommended
 BuildRequires: texlive-collection-basic
-BuildRequires: texlive-upquote
 BuildRequires: tex-framed
 BuildRequires: tex-multirow
 BuildRequires: tex-threeparttable
 BuildRequires: tex-titlesec
 BuildRequires: tex-wrapfig
+%if 0%{?fedora}
+BuildRequires: texlive-capt-of.noarch
+BuildRequires: texlive-eqparbox.noarch
+BuildRequires: texlive-upquote
+%endif
 
 %package doc
 Summary: Bugzilla documentation
@@ -71,20 +75,50 @@ BuildRequires: python
 # mod_perl modules
 %global __requires_exclude %__requires_exclude|^perl\\(Apache2::
 %global __requires_exclude %__requires_exclude|^perl\\(ModPerl::
+# installation of optional modules
+%global __requires_exclude %__requires_exclude|^perl\\(Config\\)$
+%global __requires_exclude %__requires_exclude|^perl\\(CPAN\\)$
 # authentification modules
 %global __requires_exclude %__requires_exclude|^perl\\(Authen::Radius\\)$
-%global __requires_exclude %__requires_exclude|^perl\\(Net::LDAP\\)$
+%global __requires_exclude %__requires_exclude|^perl\\(Net::LDAP
 # database modules
 %global __requires_exclude %__requires_exclude|^perl\\(DBD::Oracle\\)$
 %global __requires_exclude %__requires_exclude|^perl\\(DBD::Pg\\)$
 %global __requires_exclude %__requires_exclude|^perl\\(DBI::db\\)$
 %global __requires_exclude %__requires_exclude|^perl\\(DBI::st\\)$
+# graphical reports and charts
+%global __requires_exclude %__requires_exclude|^perl\\(Chart::Lines\\)$
+%global __requires_exclude %__requires_exclude|^perl\\(GD::Graph\\)$
+%global __requires_exclude %__requires_exclude|^perl\\(GD::Graph\\)$
+%global __requires_exclude 
%__requires_exclude|^perl\\(Template::Plugin::GD::Image\\)$
 # inbound email modules
 %global __requires_exclude 
%__requires_exclude|^perl\\(Email::MIME::Attachment::Stripper\\)$
 %global __requires_exclude %__requires_exclude|^perl\\(Email::Reply\\)$
+%global __requires_exclude 
%__requires_exclude|^perl\\(HTML::FormatText::WithLinks\\)$
+# automatic charset detection for text attachments
+%global __requires_exclude %__requires_exclude|^perl\\(Encode
+# sniff MIME type of attachments
+%global __requires_exclude 
%__requires_exclude|^perl\\(File::MimeInfo::Magic\\)$
+%global __requires_exclude %__requires_exclude|^perl\\(IO::Scalar\\)$
+# mail queueing
+%global __requires_exclude %__requires_exclude|^perl\\(TheSchwartz\\)$
+%global __requires_exclude %__requires_exclude|^perl\\(Daemon::Generic\\)$
+# smtp security
+%global __requires_exclude %__requires_exclude|^perl\\(Authen::SASL\\)$
+%global __requires_exclude %__requires_exclude|^perl\\(Net::SMTP::SSL\\)$
 # bug moving modules
 %global __requires_exclude %__requires_exclude|^perl\\(MIME::Parser\\)$
 %global __requires_exclude %__requires_exclude|^perl\\(XML::Twig\\)$
+# update notifications
+%global __requires_exclude %__requires_exclude|^perl\\(LWP::UserAgent\\)$
+# use html in product and group descriptions
+%global __requires_exclude %__requires_exclude|^perl\\(HTML::Parser\\)$
+%global __requires_exclude %__requires_exclude|^perl\\(HTML::Scrubber\\)$
+# memcached support
+%global __requires_exclude %__requires_exclude|^perl\\(Cache::Memcached\\)$
+# documentation
+%global __requires_exclude 
%__requires_exclude|^perl\\(File::Copy::Recursive\\)$
+%global __requires_exclude %__requires_exclude|^perl\\(File::Which\\)$
 # xml-rpc and json-rpc modules
 %global __requires_exclude %__requires_exclude|^perl\\(XMLRPC::
 %global __requires_exclude %__requires_exclude|^perl\\(HTTP::Message\\)$
@@ -249,6 +283,11 @@ popd > /dev/null)
 %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm
 
 %changelog
+* Sun Nov 27 2016 Emmanuel Seyman <emman...@seyman.fr> - 5.0.3-2
+- Check for perl(JSON::RPC::Legacy::Server::CGI) instead of perl(JSON::RPC)
+- Add build requirements for texlive sub-packages
+- Filter out more optional dependencies
+
 * Mon May 16 2016 Emmanuel Seyman <emman...@seyman.fr> - 5.0.3-1
 - Update to 5.0.3, dropping backported patch
 
@@ -259,7 +298,7 @@ popd > /dev/null)
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 
 * Sat Jan 16 2016 Emmanuel Seyman <emman...@seyman.fr> - 5.0.2-1
-- Update to 5.0.2, with thnaks to Tuomo Soini (#1275609)
+- Update to 5.0.2, with thanks to Tuomo Soini (#1275609)
 - Use dnf instead of yum when advising to install perl modules
 - Change documentation URL to bugzilla.readthedocs.org
 
-- 
cgit v0.12


        
http://pkgs.fedoraproject.org/cgit/bugzilla.git/commit/?h=f24&id=fefbbd93fc0e8869000a6e4f36874e0ecf97d45a
_______________________________________________
perl-devel mailing list -- perl-devel@lists.fedoraproject.org
To unsubscribe send an email to perl-devel-le...@lists.fedoraproject.org

Reply via email to