[publican-fedora: 3/3] Merge from F-15 and spec cleanups

[Peter Robinson]

commit 14dc3b862f3fa0198821906ce2e0e9d65b9aa824
Merge: 0f0eb8b fa4f0da
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Tue Apr 17 14:33:31 2012 +0100

    Merge from F-15 and spec cleanups

 publican-fedora.spec |   26 +++++++++++++++-----------
 1 files changed, 15 insertions(+), 11 deletions(-)
---
diff --cc publican-fedora.spec
index a266e5c,f70ced6..e68ea53
--- a/publican-fedora.spec
+++ b/publican-fedora.spec
@@@ -3,11 -3,11 +3,11 @@@
  
  Name:		publican-%{brand}
  Summary:	Publican documentation template files for %{brand}
- Version:2.0
- Release:	2%{?dist}
+ Version:	2.0
 -Release:	3%{?dist}
++Release:	5%{?dist}
  License:	CC-BY-SA
  Group:		Development/Libraries
--Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
++
  # Limited to these arches on RHEL 6 due to PDF + Java limitations
  %if %{RHEL6}
  ExclusiveArch:   i686 x86_64
@@@ -15,10 -15,10 +15,9 @@@
  BuildArch:   noarch
  %endif
  Source:		https://fedorahosted.org/releases/publican/%{name}-%{version}.tgz
- Requires:	publican >= 2.0
- BuildRequires:	publican >= 2.0
+ Requires:	publican >= 2.5
+ BuildRequires:	publican >= 2.5
  URL:		https://publican.fedorahosted.org
--Obsoletes:	documentation-devel-Fedora
  
  %description
  This package provides common files and templates needed to build documentation
@@@ -31,13 -31,13 +30,9 @@@ for %{brand} with publican
  publican build --formats=xml --langs=all --publish
  
  %install
  mkdir -p -m755 $RPM_BUILD_ROOT%{_datadir}/publican/Common_Content
  publican install_brand --path=$RPM_BUILD_ROOT%{_datadir}/publican/Common_Content
  
--%clean
--rm -rf $RPM_BUILD_ROOT
--
  %files
  %defattr(-,root,root,-)
  %doc README
@@@ -45,9 -45,12 +40,18 @@@
  %{_datadir}/publican/Common_Content/%{brand}
  
  %changelog
- * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0-2
++* Tue Apr 17 2012 Peter Robinson <pbrobinson at fedoraproject.org> - 2.0-5
++- Merge from F-15 and spec cleanups
++
++* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0-4
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 +
+ * Wed Jun 22 2011 Rüdiger Landmann <r.landmann at redhat.com> 2.0-3
+ - fix Requires
+ 
+ * Wed Jun 22 2011 Rüdiger Landmann <r.landmann at redhat.com> 2.0-2
+ - Rebuild to fix problems with entities -- BZ#714810
+ 
  * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0-1
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild