Compare commits

...

2 Commits
master ... f23

Author SHA1 Message Date
Peter Robinson f9e011bb35 fix merge 2015-09-22 04:19:11 +00:00
Jeff Fearn b3b4295b1a new upstream 2015-09-14 13:07:40 +10:00
1 changed files with 2 additions and 5 deletions

View File

@ -53,7 +53,7 @@ BuildRequires: perl(Archive::Tar) => 1.84
BuildRequires: perl(Archive::Zip)
# Not reall required, but sometimes koji pulls in a conflicting dep...
BuildRequires: perl(Compress::Zlib) => 2.030
BuildRequires: perl(Locale::Maketext::Gettext) >= 1.27
BuildRequires: perl-Locale-Maketext-Gettext >= 1.27-1.2
BuildRequires: perl(Carp)
BuildRequires: perl(Config::Simple)
BuildRequires: perl(Cwd)
@ -115,7 +115,7 @@ BuildRequires: rpm-build libicu-devel
# Most of these are handled automatically
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Requires: perl(Locale::Maketext::Gettext) >= 1.27
Requires: perl-Locale-Maketext-Gettext >= 1.27-1.2
Requires: rpm-build
Requires: docbook-style-xsl >= 1.77.1
Requires: perl(XML::LibXML) >= 1.70
@ -384,9 +384,6 @@ rm -rf $RPM_BUILD_ROOT
- Fix formalpara ids being dropped for DocBook 4.5. BZ #1209344
- Add --no_clean option to allow custom entity files. BZ #1208069
* Tue Feb 24 2015 Petr Pisar <ppisar@redhat.com> - 4.2.6-1
- Fix versions in Perl module dependencies again
* Tue Oct 21 2014 Jeff Fearn <jfearn@redhat.com> 4.2.6-0
- Fix External_Links translation not merging. BZ #1153911