diff options
| author | Karsten Wade <kwade@redhat.com> | 2006-02-23 23:06:41 +0000 |
|---|---|---|
| committer | Karsten Wade <kwade@redhat.com> | 2006-02-23 23:06:41 +0000 |
| commit | dae44cc2548b0c1d5b800740923069f74c4ca7c6 (patch) | |
| tree | f56e5a4a1480168924deb7e8fffd5bc6b09c215c | |
| parent | 9b7822fcf152eca03b3d0fc5c6bc9f68e380f740 (diff) | |
| download | fedora-doc-utils-dae44cc2548b0c1d5b800740923069f74c4ca7c6.tar.gz fedora-doc-utils-dae44cc2548b0c1d5b800740923069f74c4ca7c6.tar.xz fedora-doc-utils-dae44cc2548b0c1d5b800740923069f74c4ca7c6.zip | |
Changing licensing calls to OPL, I ignored templates.xsl because it is using a conditional, which is called for just-in-case, I reckon.
| -rw-r--r-- | packaging/bookinfo.xsl | 2 | ||||
| -rw-r--r-- | packaging/fedora-doc-common.spec | 2 | ||||
| -rw-r--r-- | packaging/fedora-doc.omf.in.common | 2 | ||||
| -rw-r--r-- | packaging/fedora-doc.spec.in.common | 2 | ||||
| -rw-r--r-- | packaging/info2rpminfo.xsl | 2 | ||||
| -rw-r--r-- | packaging/omf.xsl | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/packaging/bookinfo.xsl b/packaging/bookinfo.xsl index 98176dc..3df6c35 100644 --- a/packaging/bookinfo.xsl +++ b/packaging/bookinfo.xsl @@ -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> diff --git a/packaging/fedora-doc-common.spec b/packaging/fedora-doc-common.spec index b544c99..ba1be64 100644 --- a/packaging/fedora-doc-common.spec +++ b/packaging/fedora-doc-common.spec @@ -8,7 +8,7 @@ Name: fedora-doc-common # 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 diff --git a/packaging/fedora-doc.omf.in.common b/packaging/fedora-doc.omf.in.common index fb609fc..930a242 100644 --- a/packaging/fedora-doc.omf.in.common +++ b/packaging/fedora-doc.omf.in.common @@ -23,6 +23,6 @@ <identifier url="file:/usr/share/fedora/doc/fedora-doc-@DOCBASE@/C/@DOCBASE@-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> diff --git a/packaging/fedora-doc.spec.in.common b/packaging/fedora-doc.spec.in.common index 73667a0..bdc4f76 100644 --- a/packaging/fedora-doc.spec.in.common +++ b/packaging/fedora-doc.spec.in.common @@ -4,7 +4,7 @@ Summary: Fedora documentation: %{docbase} 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 diff --git a/packaging/info2rpminfo.xsl b/packaging/info2rpminfo.xsl index 6cfbe56..143a7ff 100644 --- a/packaging/info2rpminfo.xsl +++ b/packaging/info2rpminfo.xsl @@ -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"> diff --git a/packaging/omf.xsl b/packaging/omf.xsl index 02aea79..222dcdf 100644 --- a/packaging/omf.xsl +++ b/packaging/omf.xsl @@ -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> |