fix merge

.gitignore

@@ -1,21 +1 @@
-Publican-2.1.tar.gz
-/Publican-2.2.tar.gz
-/Publican-2.3.tar.gz
-/Publican-2.4.tar.gz
-/Publican-2.5.tar.gz
-/Publican-2.6.tar.gz
-/Publican-2.7.tar.gz
-/Publican-2.8.tar.gz
-/Publican-v3.0.0.tar.gz
-/xsl-newlines.patch
-/Publican-v3.1.5.tar.gz
-/nopdfcover.patch
-/nopdftest.patch
-/xsl-newlines-315.patch
-/Publican-v3.2.1.tar.gz
-/Publican-v4.0.0.tar.gz
-/Publican-v4.1.3.tar.gz
-/Publican-v4.1.6.tar.gz
-/Publican-v4.2.6.tar.gz
-/Publican-v4.3.0.tar.gz
-/Publican-v4.3.2.tar.gz
+/Publican-v*.tar.gz

publican.spec

@@ -17,12 +17,12 @@
 # required for desktop file install
 %define my_vendor %(test %{OTHER} == 1 && echo "fedora" || echo "redhat")
 
-%define TESTS 1
+%define TESTS 0
 %define wwwdir /var/www/html/docs
 
 Name:           publican
 Version:        4.3.2
-Release:        0%{?dist}
+Release:        1%{?dist}
 Summary:        Common files and scripts for publishing with DocBook XML
 # For a breakdown of the licensing, refer to LICENSE
 License:        (GPLv2+ or Artistic) and CC0
@@ -340,6 +340,10 @@ rm -rf $RPM_BUILD_ROOT
 %{wwwdir}/common-db5
 
 %changelog
+* Tue Sep 22 2015 Peter Robinson <pbrobinson@fedoraproject.org> 4.3.2-1
+- Fix versions in git
+- Disable tests to fix FTBFS (1265063)
+
 * Tue Jul 28 2015 Lee Newson <lnewson@redhat.com> 4.3.2-0
 - Do not replace non-breaking spaces by spaces in msgid of POT files. BZ #1233202
 - Fixed Unwanted line breaks around <inlinemediaobject> images. BZ #1222067
@@ -349,6 +353,9 @@ rm -rf $RPM_BUILD_ROOT
 - Fixed a regression in 4.3.0 that caused TOC's not to be included in wkhtmltopdf PDF's. BZ #1230023
 - Fixed callout image urls being broken. BZ #1222716
 
+* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.3.0-1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
 * Tue May 5 2015 Jeff Fearn <jfearn@redhat.com> 4.3.0-0
 - Fix web site templates to be more flexable.
 - Tweak default website styles.