[publican-jboss/f14] update to 2.6

[Rüdiger Landmann]

commit 91170db8d9d6309bb2168af67dcf1903def1ad9b
Author: Ruediger Landmann <r.landmann at redhat.com>
Date:   Thu Jun 9 21:42:23 2011 +1000

    update to 2.6

 .gitignore             |    1 +
 publican-jboss-2.4.tgz |  Bin 134180 -> 0 bytes
 publican-jboss.spec    |   19 +++++++++++++++++--
 sources                |    1 +
 4 files changed, 19 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..668f80e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/publican-jboss-2.6.tgz
diff --git a/publican-jboss.spec b/publican-jboss.spec
index 60658be..44b402c 100644
--- a/publican-jboss.spec
+++ b/publican-jboss.spec
@@ -1,13 +1,20 @@
 %define brand JBoss
+%define pub_name Publican
+%define RHEL6 %(test %{?dist} == .el6 && echo 1 || echo 0)
 
 Name:		publican-jboss
 Summary:	Common documentation files for %{brand}
-Version:	2.4
+Version:	2.6
 Release:	1%{?dist}
 License:	CC-BY-SA
 Group:		Applications/Text
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Buildarch:	noarch
+# Limited to these arches on RHEL 6 due to PDF + Java limitations
+%if %{RHEL6}
+ExclusiveArch:   i686 x86_64
+%else
+BuildArch:   noarch
+%endif
 Source:		https://fedorahosted.org/releases/p/u/publican/%{name}-%{version}.tgz
 Requires:	publican >= 2.5
 BuildRequires:	publican >= 2.5
@@ -40,6 +47,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/publican/Common_Content/%{brand}
 
 %changelog
+* Thu Jun 9 2011 Rüdiger Landmann <r.landmann at redhat.com> 2.6-1
+- fix support for extra trademarks -- BZ#708259
+
+* Thu Jun 9 2011 Rüdiger Landmann <r.landmann at redhat.com> 2.5-1
+- add "getting help" section
+- update "giving feedback" section -- BZ#706302
+- add support for extra trademarks -- BZ#708259
+
 * Fri Jan 21 2011 Rüdiger Landmann <r.landmann at redhat.com> 2.4-1
 - remove max_image_width
 
diff --git a/sources b/sources
index e69de29..2e15ec8 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+f6aca95ce58d260225abee6ee0c0a059  publican-jboss-2.6.tgz