Reduce redundancy, and create new, stupider pet tricks

1 files changed, 12 insertions, 14 deletions

diff --git a/packaging/spec.xsl b/packaging/spec.xsl
index 2ce3e3a..6693634 100644
--- a/packaging/spec.xsl
+++ b/packaging/spec.xsl
@@ -46,13 +46,15 @@ Group:          Documentation
 <xsl:value-of select="desc"/></xsl:if></xsl:for-each>
 
 %prep
-%setup -q -n %{docbase}-${version}
-for in in $RPM_BUILD_DIR/%{docbase}-%{version}/%{docbase}*.xml
+%setup -q -n %{docbase}-%{version}
+for i in $RPM_BUILD_DIR/%{docbase}-%{version}/{%{docbase}*.xml,Makefile}
 do
-	%{__sed} -i 's;../docs-common;../../docs-common;' "$i"
+	%{__sed} -i 's;../docs-common;../../../docs-common;' "$i"
 done
 
+
 %build
+make html
 #	/bin/rm -r $RPM_BUILD_ROOT
 #	/usr/bin/install -d -m 0755 $RPM_BUILD_ROOT/%{_datadir}/omf/%{name}
 
@@ -71,19 +73,15 @@ done
 </xsl:for-each>
 
 %changelog
-<xsl:for-each select="/rpm-info/changelog/revision"><xsl:if test="@role='rpm'">* <xsl:value-of select="@date"/> - <xsl:value-of select="author/@wholename"/> &lt;<xsl:value-of select="author/@email"/>&gt; - <xsl:value-of select="@version"/>
+<xsl:for-each select="/rpm-info/changelog/revision"><xsl:if 
+	test="@role='rpm'">* <xsl:value-of select="@date"/> - <xsl:call-template
+	  name="packager"><xsl:with-param name="who"
+	    select="author/@worker"/></xsl:call-template> - <xsl:value-of
+	  select="@version"/>-<xsl:value-of select="@release"/>
 - <xsl:value-of select="details"/>
+
 </xsl:if></xsl:for-each>
 </xsl:template>
 
-  <xsl:template name="get-title">
-    <xsl:for-each select="/rpm-info/titles/translation">
-      <xsl:choose>
-	<xsl:when test="@lang = $lang">
-	  <xsl:value-of select="title"/>
-	</xsl:when>
-      </xsl:choose>
-    </xsl:for-each>
-  </xsl:template>
-
+  <xsl:include href="templates.xsl"/>
 </xsl:stylesheet>