From 4be0ae5d2228517477eb69ba6142c09f88dd1074 Mon Sep 17 00:00:00 2001
From: Mat Booth <fedora@matbooth.co.uk>
Date: Aug 10 2013 15:45:20 +0000
Subject: Update for newer guidelines


---

diff --git a/xml-stylebook.spec b/xml-stylebook.spec
index db3f112..17d4572 100644
--- a/xml-stylebook.spec
+++ b/xml-stylebook.spec
@@ -1,6 +1,6 @@
 Name:          xml-stylebook
 Version:       1.0
-Release:       0.12.b3_xalan2.svn313293%{?dist}
+Release:       0.13.b3_xalan2.svn313293%{?dist}
 Summary:       Apache XML Stylebook
 Group:         Development/Libraries
 License:       ASL 1.1
@@ -17,7 +17,6 @@ Patch0:        %{name}-image-printer.patch
 # Patch the build script to build javadocs
 Patch1:        %{name}-build-javadoc.patch
 
-BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:     noarch
 
 BuildRequires: java-devel >= 1:1.6.0
@@ -85,18 +84,13 @@ java -classpath "$(build-classpath xml-commons-apis):$(build-classpath jaxp_pars
 popd
 
 %install
-rm -rf %{buildroot}
-
 # jars
 install -pD -T bin/stylebook-%{version}-b3_xalan-2.jar \
-  %{buildroot}%{_javadir}/%{name}-%{version}.jar
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}.jar; do \
-  ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+  %{buildroot}%{_javadir}/%{name}.jar
 
 # javadoc
-install -d %{buildroot}%{_javadocdir}/%{name}-%{version}
-cp -pr build/javadoc/* %{buildroot}%{_javadocdir}/%{name}-%{version}
-(cd %{buildroot}%{_javadocdir} && ln -sf %{name}-%{version} %{name}) 
+install -d %{buildroot}%{_javadocdir}/%{name}
+cp -pr build/javadoc/* %{buildroot}%{_javadocdir}/%{name}
 
 # examples
 install -d %{buildroot}%{_datadir}/%{name}
@@ -104,24 +98,21 @@ cp -pr docs %{buildroot}%{_datadir}/%{name}
 cp -pr styles %{buildroot}%{_datadir}/%{name}
 cp -pr results %{buildroot}%{_datadir}/%{name}
 
-%clean
-rm -rf %{buildroot}
-
 %files
-%defattr(-,root,root,-)
 %doc LICENSE.txt
 %{_javadir}/*
 
 %files javadoc
-%defattr(-,root,root,-)
-%{_javadocdir}/%{name}-%{version}
+%doc LICENSE.txt
 %{_javadocdir}/%{name}
 
 %files demo
-%defattr(-,root,root,-)
 %{_datadir}/%{name} 
 
 %changelog
+* Sat Aug 10 2013 Mat Booth <fedora@matbooth.co.uk> - 1.0-0.13.b3_xalan2.svn313293
+- Update for newer guidelines
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-0.12.b3_xalan2.svn313293
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
@@ -147,7 +138,7 @@ rm -rf %{buildroot}
 - Link to local java API docs properly and fix requires on javadoc package.
 - Build with source and target levels of 1.5 so we don't have to require 1.6.
 
-* Mon Apr 22 2010 Mat Booth <fedora@matbooth.co.uk> - 1.0-0.4.b3_xalan2.svn313293
+* Thu Apr 22 2010 Mat Booth <fedora@matbooth.co.uk> - 1.0-0.4.b3_xalan2.svn313293
 - Remove font from demo package to comply with guidelines. RHBZ #567912
 
 * Mon Jan 11 2010 Mat Booth <fedora@matbooth.co.uk> - 1.0-0.3.b3_xalan2.svn313293