Rebase on upstream 2.8

- Rebase on new upstream version -- BZ#659589 BZ#659590 BZ#659591

.gitignore

@@ -1 +1,8 @@
 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.spec

@@ -1,18 +1,12 @@
 
 # Track font name changes
-%define RHEL5 %(test %{?dist} == .el5 && echo 1 || echo 0)
-%define RHEL6 %(test %{?dist} == .el6 && echo 1 || echo 0)
+%define RHEL6 %([[ %{?dist}x == .el6[a-z]* ]] && echo 1 || echo 0)
 # Assume not rhel means FC11+ ... ugly
 %define OTHER 1
+
 %if %{RHEL6}
 %define OTHER 0
 %endif
-%if %{RHEL5}
-%define OTHER 0
-%endif
-
-# who doesn't have xdg-open?
-%define HTMLVIEW %(test %{RHEL5} == 1 && echo 1 || echo 0)
 
 # required for desktop file install
 %define my_vendor %(test %{OTHER} == 1 && echo "fedora" || echo "redhat")
@@ -20,8 +14,8 @@
 %define TESTS 0
 
 Name:           publican
-Version:        2.1
-Release:        0%{?dist}
+Version:        2.8
+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
@@ -31,16 +25,19 @@ Source0:        https://fedorahosted.org/released/publican/Publican-%{version}.t
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # Limited to these arches on RHEL 6 due to PDF + Java limitations
 %if %{RHEL6}
-BuildArch:      i386 x86_64
+ExclusiveArch:   i686 x86_64
 %else
 BuildArch:      noarch
 %endif
 
 # Get rid of the old packages
-Obsoletes:      perl-Publican-WebSite < 1.5
-Obsoletes:      publican-WebSite-obsoletes < 1.21
-Provides:       perl-Publican-WebSite = 1.5
-Provides:       publican-WebSite-obsoletes = 1.21
+Obsoletes:      perl-Publican-WebSite
+Obsoletes:      publican-WebSite-obsoletes
+Conflicts: perl-Publican-WebSite
+Conflicts: publican-WebSite-obsoletes
+# Do NOT support very old packages
+#Provides:       perl-Publican-WebSite = 1.5
+#Provides:       publican-WebSite-obsoletes = 1.21
 
 BuildRequires:  perl(Devel::Cover)
 BuildRequires:  perl(Module::Build)
@@ -63,6 +60,7 @@ BuildRequires:  perl(File::Find)
 BuildRequires:  perl(File::Find::Rule)
 BuildRequires:  perl(File::Path)
 BuildRequires:  perl(File::pushd)
+BuildRequires:  perl(File::Which)
 BuildRequires:  perl(HTML::FormatText)
 BuildRequires:  perl(HTML::TreeBuilder)
 BuildRequires:  perl(I18N::LangTags::List)
@@ -79,10 +77,11 @@ BuildRequires:  perl(Test::Pod)
 BuildRequires:  perl(version)
 BuildRequires:  perl(XML::LibXML)  >=  1.67
 BuildRequires:  perl(XML::LibXSLT) >=  1.67
-BuildRequires:  perl(XML::TreeBuilder) >= 3.09-15
-BuildRequires:  fop >= 0.95
+BuildRequires:  perl(XML::Simple)
+BuildRequires:  perl(XML::TreeBuilder) >= 4.0
+BuildRequires:  fop
 BuildRequires:  batik
-BuildRequires:  docbook-style-xsl >= 1.75.2-5
+BuildRequires:  docbook-style-xsl >= 1.76.1
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  perl-Template-Toolkit
@@ -91,28 +90,17 @@ BuildRequires:  perl(DBD::SQLite)
 # Most of these are handled automatically
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires:       perl(Locale::Maketext::Gettext)
-Requires:       fop >= 0.95
+Requires:       fop
 Requires:       batik rpm-build
-Requires:       docbook-style-xsl >= 1.75.2-5
+Requires:       docbook-style-xsl >= 1.76.1
 Requires:       perl(XML::LibXML)  >=  1.67
 Requires:       perl(XML::LibXSLT) >=  1.67
-Requires:       perl(XML::TreeBuilder) >= 3.09-15
+Requires:       perl(XML::TreeBuilder) >= 4.0
 Requires:       gettext cvs
 Requires:       perl-Template-Toolkit
 Requires:       perl(DBD::SQLite)
-
+ 
 # Pull in the fonts for all languages, else you can't build translated PDF in brew/koji
-%if %{RHEL5}
-Requires:       fonts-bengali fonts-chinese fonts-chinese-zysong fonts-gujarati
-Requires:       fonts-hindi fonts-japanese fonts-kannada fonts-korean
-Requires:       fonts-malayalam fonts-oriya fonts-punjabi fonts-sinhala
-Requires:       fonts-tamil fonts-telugu liberation-fonts
-BuildRequires:  fonts-bengali fonts-chinese fonts-chinese-zysong fonts-gujarati
-BuildRequires:  fonts-hindi fonts-japanese fonts-kannada fonts-korean
-BuildRequires:  fonts-malayalam fonts-oriya fonts-punjabi fonts-sinhala
-BuildRequires:  fonts-tamil fonts-telugu liberation-fonts
-#BuildRequires:  java-1.5.0-sun java-1.5.0-sun-devel chkconfig
-%endif
 %if %{RHEL6}
 Requires:       liberation-mono-fonts liberation-sans-fonts liberation-serif-fonts
 Requires:       cjkuni-uming-fonts ipa-gothic-fonts ipa-pgothic-fonts
@@ -133,7 +121,8 @@ BuildRequires:  lklug-fonts baekmuk-ttf-batang-fonts
 %endif
 
 Obsoletes:      Publican < 1.0
-Provides:       Publican = 1.0
+# Do NOT support very old packages
+#Provides:       Publican = 1.0
 
 %description
 Publican is a DocBook publication system, not just a DocBook processing tool.
@@ -143,13 +132,10 @@ your XML is up to publishable standard.
 %package doc
 Group:          Documentation
 Summary:        Documentation for the Publican package
-%if %{HTMLVIEW}
-Requires:       htmlview
-%else
 Requires:       xdg-utils
-%endif
 Obsoletes:      Publican-doc < 1.0
-Provides:       Publican-doc = 1.0
+# Do NOT support very old packages
+#Provides:       Publican-doc = 1.0
 
 %description doc
 Publican is a tool for publishing material authored in DocBook XML.
@@ -163,10 +149,10 @@ solely on using the publican tools.
 %build
 %{__perl} Build.PL installdirs=vendor
 ./Build
-dir=`pwd` && cd Users_Guide && perl -I $dir/blib/lib $dir/blib/script/publican build \
-        --formats=html-desktop --publish --langs=all \
-        --common_config="$dir/blib/datadir" \
-        --common_content="$dir/blib/datadir/Common_Content"
+dir=`pwd` && cd Users_Guide && %{__perl} -CA -I $dir/blib/lib $dir/blib/script/publican build \
+    --formats=html-desktop --publish --langs=all \
+    --common_config="$dir/blib/datadir" \
+    --common_content="$dir/blib/datadir/Common_Content"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -181,16 +167,12 @@ find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
 sed -i -e 's|@@FILE@@|%{_docdir}/%{name}-doc-%{version}/en-US/index.html|' %{name}.desktop
 sed -i -e 's|@@ICON@@|%{_docdir}/%{name}-doc-%{version}/en-US/images/icon.svg|' %{name}.desktop
 
-%if %{HTMLVIEW}
-sed -i -e 's|xdg-open|htmlview|' %{name}.desktop
-%endif
-
 desktop-file-install --vendor="%{my_vendor}" --dir=$RPM_BUILD_ROOT%{_datadir}/applications %{name}.desktop
 
 for file in po/*.po; do
-	lang=`echo "$file" | sed -e 's/po\/\(.*\)\.po/\1/'`;
-        mkdir -p $RPM_BUILD_ROOT%{_datadir}/locale/$lang/LC_MESSAGES;
-	msgfmt $file -o $RPM_BUILD_ROOT%{_datadir}/locale/$lang/LC_MESSAGES/%{name}.mo;
+    lang=`echo "$file" | sed -e 's/po\/\(.*\)\.po/\1/'`;
+    mkdir -p $RPM_BUILD_ROOT%{_datadir}/locale/$lang/LC_MESSAGES;
+    msgfmt $file -o $RPM_BUILD_ROOT%{_datadir}/locale/$lang/LC_MESSAGES/%{name}.mo;
 done
 
 %find_lang %{name}
@@ -199,6 +181,7 @@ done
 %if %{TESTS}
 ./Build test
 %endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -211,7 +194,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 %{_bindir}/publican
 %{_datadir}/publican
+%config(noreplace) %{_datadir}/publican/default.db
 %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/publican-website.cfg
+%config(noreplace) %{_sysconfdir}/bash_completion.d/_publican
 
 %files doc
 %defattr(-,root,root,-)
@@ -220,6 +205,113 @@ rm -rf $RPM_BUILD_ROOT
 %doc fdl.txt
 
 %changelog
+* Thu Sep 22 2011 Jeff Fearn <jfearn@redhat.com> 2.8-1
+- New release.
+
+* Tue Sep 06 2011 Jeff Fearn <jfearn@redhat.com> 2.7-1
+- New release.
+
+* Thu Jul 28 2011 Jeff Fearn <jfearn@redhat.com> 2.6-3
+- Force publican to use UTF8 for command line options.
+- Add rpmlint cfg for brew checks.
+
+* Wed Jul 27 2011 Jeff Fearn <jfearn@redhat.com> 2.6-2
+- Fix archness ... java hate increases
+
+* Mon Jul 25 2011 Jeff Fearn <jfearn@redhat.com> 2.6-1
+- New Version, see Changes file.
+
+* Fri Dec 02 2010 Jeff Fearn <jfearn@redhat.com> 2.5-1
+- Use SPEC_VERSION for splash page spec files.
+
+* Thu Dec 02 2010 Jeff Fearn <jfearn@redhat.com> 2.4-1
+- Force removal of old packages
+
+* Thu Dec 02 2010 Jeff Fearn <jfearn@redhat.com> 2.4-0
+- Add de.po to MANIFEST
+- Add menu hide option. BZ #650037
+- Only set title attribute in HTMl if alt text is set. BZ #651247
+- Changed tabs to spaces in the specfile xsl BZ #652120
+- Fix broken version splash page icon. BZ #647360
+- Add web_formats option. BZ #647360
+- Add Lohit Devanagari to Marathi font list. BZ #654554
+- Stop publican setting imagedata format. BZ #654939
+- Fix DocBook 5 DTD string format change. BZ #655621
+- Add dt_requires and menu_category options. BZ #647352
+- Remove web PDF from Indic + ar-SA,fa-IR,he-IL. BZ #655713
+- Fix publish breaking UTF8 file names. BZ #648126
+- Fix non-en lang breaking website strings. BZ #656139
+- Fix IE8 javascript and layout issues. BZ #656531
+- Remove Red elements from interactive.css. BZ #650950
+- Added support for home page site_overrides.css file.  BZ #650950
+- Add check for outdated SRPMS.
+
+* Tue Oct 26 2010 Jeff Fearn <jfearn@redhat.com> 2.3-0
+- Prepend product name to product/version splash pages.
+- Fix bash completion for --brand and --type.
+- Use --nocolours in spec files.
+- Update tocs when home/product/version pages are updated. BZ #612027
+- Scroll to current entry in navigation menu.
+- Highlight current book in navigation menu.
+- Fix single quote in abstract/subtitle breaking RPM install. BZ #642088
+- Fix RPM website not installing cleanly.
+- Fix splash page icon wrap. BZ #642109
+- Moved titles before: example, equation, table. BZ #638787
+- Change html and PDF style for verbatim & example. BZ #638787
+- Change html and PDF style for admonitions. BZ #638787
+- Fix HTML footer style and layout.
+- Add bump action Tech Preview.
+- Fix indexterm merge missing nested nodes. BZ #643275
+- Add phrase to translatable tag list. BZ #643287
+- Fix POT files breaking when using HTML::Tree 4.0.
+- Fix translated label missing from manually installed book. BZ #643781
+- Add icon.svg to Create Book. BZ #644105
+- Add XML dump options for site config.
+- Fix histroy typo
+- Stop max_image_width overriding XML width settings.
+- Decrease white space at top and bottom of PDF.
+- Fix toc links to refentry in chunked HTML. BZ #645602
+
+* Wed Oct 06 2010 Jeff Fearn <jfearn@redhat.com> 2.2-0
+- Extend callout graphics to 40; adjust colour and font BZ #629804 <r.landmann@redhat.com>
+- Make keycombo example consistent with RHEL6 behaviour. BZ #618735 <r.landmann@redhat.com>
+- Restrict CSS style for edition to title pages to avoid applying to bibliographies <r.landmann@redhat.com>
+- Fix images/icon.svg breaking rpm build. BZ #612515
+- Fix empty term breaking PDF build. BZ #614728
+- Fix footnote not catching modified para. BZ #565903
+- Fix SRPM not including web labels. BZ #621036
+- Update tocs when home page is updated. BZ #612027
+- Don't display stats for unused languages. BZ #613500
+- Fix admonitions/varlistentry not having IDs. BZ #616112
+- Fix procedure/itemizedlist/orderedlist not having IDs. BZ #612817
+- Catch invalid revision in translation. BZ #621721
+- Limit index.html redirection to installed languages. BZ #612009
+- Fix smaller width being overridden by max_image_width. BZ #613140
+- Fix support for def_lang for web sites. BZ #622030
+- Remove ant trails from selected links.
+- Add --novalid option to disable validation when building. BZ #616142
+- Revert change to escaping ', ", >, <. BZ #628266
+- Add support for product and version splash pages. BZ #613502
+- Fix unused version breaking product hiding.
+- Add support for alerts for parameters.
+- Add bash completion.
+- Validate revnumber for changelog. BZ #628464
+- Add basic man page support. BZ #632027
+- Add basic support for line numbers. BZ #629463
+- Add warning messages for out of date translations.
+- Add productname to IGNOREBLOCKS. BZ #625316
+- Add OPDS support. BZ #615831
+- Fix translated labels in web nav. BZ #631647
+- Remove highlighting from output of prompt tag in html. BZ #618902 <ryanlerch@gmail.com>
+- Resize index title font to a sane size. BZ #624392
+- Fix misapplied fonts for CJK. BZ #628786
+- Fix attributes breaking translation merge. BZ #638816
+- Fix entities missing from RPM description. BZ #626254
+- Add bridgehead_in_toc parameter. BZ #616123
+- Support '--lang all' for lang_stats.
+- Left align CJK in PDF. BZ #639811
+- Fix constraint regex on docname and productname. BZ #640082
+
 * Tue Jul 06 2010 Jeff Fearn <jfearn@redhat.com> 2.1-0
 - Fix broken install_book not updating DB.
 - Fix typos in docs.
@@ -711,7 +803,7 @@ rm -rf $RPM_BUILD_ROOT
 - Fixed "uninitialized value" error when product not set. BZ #426038
 - Fixed Brand not updating. BZ #426043
 - Replaced FORMAL-RHI with HOLDER in Book_Template. BZ #426041
-- Remove reference to non-existant svg file. BZ #426063
+- Remove reference to non-existent svg file. BZ #426063
 - Override formal.title.properties for PDF. BZ #425894
 - Override formal.object.heading for HTML. Fix H5 & H6 css. BZ #425894
 - Prepended first 4 characters of tag to IDs to aid Translation. BZ #427312
@@ -987,4 +1079,3 @@ rm -rf $RPM_BUILD_ROOT
 
 
 
-

sources

@@ -1 +1 @@
-80bde266e0b8557adf8a848183c064a1  Publican-2.1.tar.gz
+1ddcf8e93e96d0e49868f21df41b53a4  Publican-2.8.tar.gz