docs-common/packaging bookinfo.xsl, 1.17, 1.18 fedora-doc-common.spec, 1.13, 1.14 fedora-doc.omf.in.common, 1.2, 1.3 fedora-doc.spec.in.common, 1.3, 1.4 info2rpminfo.xsl, 1.12, 1.13 omf.xsl, 1.6, 1.7

[Karsten Wade (kwade)]

Author: kwade

Update of /cvs/docs/docs-common/packaging
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11852

Modified Files:
	bookinfo.xsl fedora-doc-common.spec fedora-doc.omf.in.common 
	fedora-doc.spec.in.common info2rpminfo.xsl omf.xsl 
Log Message:
Changing licensing calls to OPL, I ignored templates.xsl because it is using a conditional, which is called for just-in-case, I reckon.


Index: bookinfo.xsl
===================================================================
RCS file: /cvs/docs/docs-common/packaging/bookinfo.xsl,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- bookinfo.xsl	22 Feb 2006 07:12:33 -0000	1.17
+++ bookinfo.xsl	23 Feb 2006 23:06:41 -0000	1.18
@@ -87,7 +87,7 @@
 	<xsl:when test="/rpm-info/license/rights='OPL'">
 	  <xsl:text disable-output-escaping="yes"><xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="</xsl:text><xsl:value-of select="$fdpdir"/><xsl:text disable-output-escaping="yes">/docs-common/common/legalnotice-opl-en.xml"/></xsl:text>
 	</xsl:when>
-	<xsl:otherwise> <!-- assume FDL for now -->
+	<xsl:otherwise> <!-- assume OPL for now -->
 	  <xsl:text disable-output-escaping="yes"><xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="</xsl:text><xsl:value-of select="$fdpdir"/><xsl:text disable-output-escaping="yes">/docs-common/common/legalnotice-en.xml"/></xsl:text>
 	</xsl:otherwise>
       </xsl:choose>


Index: fedora-doc-common.spec
===================================================================
RCS file: /cvs/docs/docs-common/packaging/fedora-doc-common.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- fedora-doc-common.spec	14 Feb 2006 22:53:20 -0000	1.13
+++ fedora-doc-common.spec	23 Feb 2006 23:06:41 -0000	1.14
@@ -8,7 +8,7 @@
 # To be defined in Makefile
 Version:        0.3.2
 Release: 	1
-License:        FDL
+License:        OPL
 Url:		http://fedora.redhat.com/projects/docs/
 Source0:	fedora-doc-common-%version.src.tar.gz
 Group:          Documentation


Index: fedora-doc.omf.in.common
===================================================================
RCS file: /cvs/docs/docs-common/packaging/fedora-doc.omf.in.common,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fedora-doc.omf.in.common	21 Nov 2005 00:37:58 -0000	1.2
+++ fedora-doc.omf.in.common	23 Feb 2006 23:06:41 -0000	1.3
@@ -23,6 +23,6 @@
     <identifier url="file:/usr/share/fedora/doc/fedora-doc- at DOCBASE@/C/@DOCBASE at -en.xml"/>
     <language code="C"/>
     <relation seriesid="7a5d3ea2-2a1e-11da-86a3-8ea47a4bb227"/>
-    <rights type="GNU FDL" license.version="1.1"/>
+    <rights type="OPL" license.version="1.0"/>
   </resource>
 </omf>


Index: fedora-doc.spec.in.common
===================================================================
RCS file: /cvs/docs/docs-common/packaging/fedora-doc.spec.in.common,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fedora-doc.spec.in.common	19 Jan 2006 19:50:05 -0000	1.3
+++ fedora-doc.spec.in.common	23 Feb 2006 23:06:41 -0000	1.4
@@ -4,7 +4,7 @@
 Name:           fedora-doc-%{docbase}
 Version:        %{version}
 Release: 	1
-License:        FDL
+License:        OPL
 Url:		http://fedora.redhat.com/projects/docs/
 Source0:        %{docbase}-%{version}.src.tar.gz
 Source1:	%{name}-C.omf


Index: info2rpminfo.xsl
===================================================================
RCS file: /cvs/docs/docs-common/packaging/info2rpminfo.xsl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- info2rpminfo.xsl	3 Feb 2006 17:57:25 -0000	1.12
+++ info2rpminfo.xsl	23 Feb 2006 23:06:41 -0000	1.13
@@ -15,7 +15,7 @@
       </xsl:element>
       <xsl:comment>CHECK LICENSING BELOW</xsl:comment>
       <xsl:element name="license">
-	<xsl:element name="rights">GNU FDL</xsl:element>
+	<xsl:element name="rights">OPL</xsl:element>
 	<xsl:element name="version">1.0</xsl:element>
       </xsl:element>
       <xsl:for-each select="copyright">


Index: omf.xsl
===================================================================
RCS file: /cvs/docs/docs-common/packaging/omf.xsl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- omf.xsl	4 Feb 2006 04:16:11 -0000	1.6
+++ omf.xsl	23 Feb 2006 23:06:41 -0000	1.7
@@ -46,7 +46,7 @@
 	  <xsl:otherwise><language code="$lang"/></xsl:otherwise>
 	</xsl:choose>
         <relation seriesid="7a5d3ea2-2a1e-11da-86a3-8ea47a4bb227"/>
-        <rights type="GNU FDL" license.version="1.1" />
+        <rights type="OPL" license.version="1.0" />
       </resource>
     </omf>
   </xsl:template>