Hello community,
here is the log from the commit of package suse-xsl-stylesheets for openSUSE:Factory checked in at 2012-05-23 09:21:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/suse-xsl-stylesheets (Old)
and /work/SRC/openSUSE:Factory/.suse-xsl-stylesheets.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "suse-xsl-stylesheets", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/suse-xsl-stylesheets/suse-xsl-stylesheets.changes 2012-05-08 10:29:56.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.suse-xsl-stylesheets.new/suse-xsl-stylesheets.changes 2012-05-23 09:21:29.000000000 +0200
@@ -1,0 +2,12 @@
+Fri May 11 13:02:23 UTC 2012 - fsundermeyer@opensuse.org
+
+- Adjusted rnc/rng generation in order to allow a custom novdocx.rng
+ that defines start tags allowed
+
+-------------------------------------------------------------------
+Fri May 11 08:20:00 UTC 2012 - toms@opensuse.org
+
+- Version 1.9.6.1:
+ Added new SUSE logo from Scott Corfield
+
+-------------------------------------------------------------------
Old:
----
suse-xsl-stylesheets-1.9.6.tar.bz2
New:
----
suse-xsl-stylesheets-1.9.6.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ suse-xsl-stylesheets.spec ++++++
--- /var/tmp/diff_new_pack.wzS5iV/_old 2012-05-23 09:21:30.000000000 +0200
+++ /var/tmp/diff_new_pack.wzS5iV/_new 2012-05-23 09:21:30.000000000 +0200
@@ -1,30 +1,24 @@
#
# spec file for package suse-xsl-stylesheets
#
-# Copyright (c) 2011, 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
-#
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
-#
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
-###############################################################
-#
-# ATTENTION: Do NOT edit this file outside of
-# https://svn.code.sf.net/p/daps/svn/trunk/daps/\
-# suse-xslt/packaging/suse-xsl-stylesheets.spec
-#
-# Your changes will be lost on the next update
-# If you do not have access to the SVN repository, notify
-# and
-# or send a patch
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-################################################################
Name: suse-xsl-stylesheets
-Version: 1.9.6
+Version: 1.9.6.2
+Release: 0
%define dtdversion 1.0
%define dtdname novdoc
@@ -33,11 +27,10 @@
%define novdoc_catalog for-catalog-%{dtdname}-%{dtdversion}.xml
%define susexsl_catalog for-catalog-%{name}.xml
-Release: 1
Summary: SUSE-branded Docbook stylesheets for XSLT 1.0
License: GPL-2.0 or GPL-3.0
Group: Productivity/Publishing/XML
-URL: http://sourceforge.net/p/daps/suse-xslt
+Url: http://sourceforge.net/p/daps/suse-xslt
Source0: %{name}-%{version}.tar.bz2
Source1: susexsl-fetch-source
Source2: %{name}.rpmlintrc
@@ -134,7 +127,6 @@
exit 0
-
#----------------------
%files
%defattr(-,root,root)
@@ -165,4 +157,5 @@
%doc %{_defaultdocdir}/%{name}/*
#----------------------
+
%changelog
++++++ suse-xsl-stylesheets-1.9.6.tar.bz2 -> suse-xsl-stylesheets-1.9.6.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/suse-xsl-stylesheets/Makefile new/suse-xsl-stylesheets/Makefile
--- old/suse-xsl-stylesheets/Makefile 2012-04-25 16:01:49.000000000 +0200
+++ new/suse-xsl-stylesheets/Makefile 2012-05-11 16:21:26.000000000 +0200
@@ -32,14 +32,14 @@
STYLEDIR := $(DESTDIR)$(PREFIX)/xml/docbook/stylesheet/suse
DOCDIR := $(DESTDIR)$(PREFIX)/doc/packages/suse-xsl-stylesheets
-all: schema/novdocx.rnc schema/novdocx.rng
+all: schema/novdocx-core.rnc schema/novdocx-core.rng schema/novdocx.rng
all: catalogs/$(NOVDOC_FOR-CATALOG) catalogs/$(SUSEXSL_FOR-CATALOG)
all: catalogs/CATALOG.$(DTDNAME)-$(DTDVERSION)
all: xhtml2html
@echo "Ready to install..."
install: create-install-dirs
- install -m644 schema/novdocx.{rnc,rng} \
+ install -m644 schema/*.{rnc,rng} \
$(DESTDIR)$(PREFIX)/xml/$(DTDNAME)/schema/rng/$(DTDVERSION)
install -m644 schema/{*.dtd,*.ent,catalog.xml,CATALOG} \
$(DESTDIR)$(PREFIX)/xml/$(DTDNAME)/schema/dtd/$(DTDVERSION)
@@ -62,7 +62,8 @@
.PHONY: clean
clean:
- rm -rf catalogs/ schema/novdocx.rnc schema/novdocx.rng xslt/html/
+ rm -rf catalogs/ schema/novdocx-core.rnc schema/novdocx-core.rng \
+ schema/novdocx.rng xslt/html/
# auto-generate the html stylesheets
#
@@ -88,11 +89,11 @@
# Generate RELAX NG schemes for novdoc
#
-schema/novdocx.rnc: schema/novdocx.dtd.tmp
- trang -I dtd $< $@
+schema/novdocx-core.rnc: schema/novdocx.dtd.tmp
+ trang -I dtd -i no-generate-start $< $@
-schema/novdocx.rng: schema/novdocx.dtd.tmp
- trang -I dtd $< $@
+schema/novdocx-core.rng: schema/novdocx.dtd.tmp
+ trang -I dtd -i no-generate-start $< $@
# To avoid unknown host errors with trang, we have to switch off the external
# entities from DocBook by creating a temporary file novdocx.dtd.tmp.
@@ -127,7 +128,7 @@
xmlcatalog --noout --create $@
xmlcatalog --noout --add "rewriteSystem" \
"http://daps.sourceforge.net/release/suse-xsl/current" \
- "file//$(SUSESTYLES)" $@
+ "file://$(SUSESTYLES)" $@
sed -i '/^<!DOCTYPE .*>$$/d' $@
sed -i '/
+#
+datatypes xsd = "http://www.w3.org/2001/XMLSchema-datatypes"
+
+include "novdocx-core.rnc"
+
+structure =
+ ## Contains all divison-like elements
+ appendix | article | book | bridgehead | chapter
+ | legalnotice
+ | glossary
+ | preface
+ | refentry
+ | refsect1 | refsect2 | refsect3
+ | set
+ | sect1 | sect2 | sect3 | sect4
+
+block =
+ ## Contains all block elements
+ # HINT: figure_s_ and table_s_ are a pattern, not an element
+ # definition
+ abstract | example | figures | tables | screen | procedure
+ | admonitions | lists
+
+start = structure | block
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/suse-xsl-stylesheets/schema/novdocx.rng new/suse-xsl-stylesheets/schema/novdocx.rng
--- old/suse-xsl-stylesheets/schema/novdocx.rng 1970-01-01 01:00:00.000000000 +0100
+++ new/suse-xsl-stylesheets/schema/novdocx.rng 2012-05-11 15:53:27.000000000 +0200
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ novdocx.dtd is a subset of DocBook and all instances should be valid
+ DocBook files, however, the docbookx.dtd is not directly referenced.
+
+ Use this file with Emacs and nXML or any other XML editor which
+ supports RELAX NG.
+
+ ** This file just definies the start pattern, but not the core
+ elements for Novdoc. The core elements are definied in the
+ novdoc-core.rnc file which is converted from the DTD during
+ installation.
+ It can be manually created by running trang with the
+ -i no-generate-start option:
+ $ trang -i no-generate-start novdocx.dtd novdocx-core.rnc
+ **
+
+ Copyright 2012 Thomas Schraitle <toms@opensuse.org>
+
+-->
+<grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0">
+ <include href="novdocx-core.rng"/>
+ <define name="structure">
+ <choice>
+ <ref name="appendix">
+ Contains all divison-like elements
+ </ref>
+ <ref name="article"/>
+ <ref name="book"/>
+ <ref name="bridgehead"/>
+ <ref name="chapter"/>
+ <ref name="legalnotice"/>
+ <ref name="glossary"/>
+ <ref name="preface"/>
+ <ref name="refentry"/>
+ <ref name="refsect1"/>
+ <ref name="refsect2"/>
+ <ref name="refsect3"/>
+ <ref name="set"/>
+ <ref name="sect1"/>
+ <ref name="sect2"/>
+ <ref name="sect3"/>
+ <ref name="sect4"/>
+ </choice>
+ </define>
+ <define name="block">
+ <choice>
+ <!--
+ HINT: figure_s_ and table_s_ are a pattern, not an element
+ definition
+ -->
+ <ref name="abstract">
+ Contains all block elements
+ </ref>
+ <ref name="example"/>
+ <ref name="figures"/>
+ <ref name="tables"/>
+ <ref name="screen"/>
+ <ref name="procedure"/>
+ <ref name="admonitions"/>
+ <ref name="lists"/>
+ </choice>
+ </define>
+ <start>
+ <choice>
+ <ref name="structure"/>
+ <ref name="block"/>
+ </choice>
+ </start>
+</grammar>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/suse-xsl-stylesheets/xslt/flyer/images/logos/suse-logo-bw.svg new/suse-xsl-stylesheets/xslt/flyer/images/logos/suse-logo-bw.svg
--- old/suse-xsl-stylesheets/xslt/flyer/images/logos/suse-logo-bw.svg 2011-08-10 16:02:57.000000000 +0200
+++ new/suse-xsl-stylesheets/xslt/flyer/images/logos/suse-logo-bw.svg 2012-05-11 10:01:53.000000000 +0200
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 11 Build 197, SVG Export Plug-In -->
+<!-- Created with Inkscape (http://www.inkscape.org/) -->