[publican/f12/master] * Thu Oct 07 2010 Jeff Fearn <jfearn at redhat.com> 2.3-0 - Prepend product name to product/version spl

Rüdiger Landmann rlandmann at fedoraproject.org
Tue Oct 26 03:04:05 UTC 2010 

commit 254f2aea0c06ab8aabb9dcff54a9a5645e8f0dda
Author: Ruediger Landmann <r.landmann at redhat.com>
Date:   Tue Oct 26 13:04:51 2010 +1000

    * Thu Oct 07 2010 Jeff Fearn <jfearn at 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

 .gitignore    |    1 +
 publican.spec |   50 +++++++++++++++++++++++++++++++++++++-------------
 sources       |    2 +-
 3 files changed, 39 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 08b7038..c156025 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 Publican-2.1.tar.gz
 /Publican-2.2.tar.gz
+/Publican-2.3.tar.gz
diff --git a/publican.spec b/publican.spec
index 9c0f7c4..21905a4 100644
--- a/publican.spec
+++ b/publican.spec
@@ -12,7 +12,6 @@
 %endif
 
 # who doesn't have xdg-open?
-#%define HTMLVIEW %(test %{RHEL5} == 1 && echo 1 || echo 0)
 %define HTMLVIEW %{RHEL5}
 
 # required for desktop file install
@@ -21,7 +20,7 @@
 %define TESTS 0
 
 Name:           publican
-Version:        2.2
+Version:        2.3
 Release:        0%{?dist}
 Summary:        Common files and scripts for publishing with DocBook XML
 # For a breakdown of the licensing, refer to LICENSE
@@ -80,6 +79,7 @@ BuildRequires:  perl(Test::Pod)
 BuildRequires:  perl(version)
 BuildRequires:  perl(XML::LibXML)  >=  1.67
 BuildRequires:  perl(XML::LibXSLT) >=  1.67
+BuildRequires:  perl(XML::Simple)
 BuildRequires:  perl(XML::TreeBuilder) >= 3.09-15
 BuildRequires:  fop >= 0.95
 BuildRequires:  batik
@@ -165,9 +165,9 @@ solely on using the publican tools.
 %{__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"
+    --formats=html-desktop --publish --langs=all \
+    --common_config="$dir/blib/datadir" \
+    --common_content="$dir/blib/datadir/Common_Content"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -189,9 +189,9 @@ sed -i -e 's|xdg-open|htmlview|' %{name}.desktop
 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}
@@ -200,6 +200,7 @@ done
 %if %{TESTS}
 ./Build test
 %endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -212,8 +213,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
-%{_sysconfdir}/bash_completion.d/_publican
+%config(noreplace) %{_sysconfdir}/bash_completion.d/_publican
 
 %files doc
 %defattr(-,root,root,-)
@@ -222,6 +224,32 @@ rm -rf $RPM_BUILD_ROOT
 %doc fdl.txt
 
 %changelog
+* Tue Oct 26 2010 Jeff Fearn <jfearn at 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 at redhat.com> 2.2-0
 - Extend callout graphics to 40; adjust colour and font BZ #629804 <r.landmann at redhat.com>
 - Make keycombo example consistent with RHEL6 behaviour. BZ #618735 <r.landmann at redhat.com>
@@ -1027,7 +1055,3 @@ rm -rf $RPM_BUILD_ROOT
 * Wed Feb 07 2007 Jeff Fearn <jfearn at redhat.com> 0.0
 - Initial creation
 
-
-
-
-
diff --git a/sources b/sources
index 95907b3..31fda68 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a3243b973dec0b1d82a4c328e2564233  Publican-2.2.tar.gz
+d9c50d9f8c09183f210d7373dd688142  Publican-2.3.tar.gz

More information about the scm-commits mailing list