OBS User unknown 2009-03-11 15:49:28 +00:00 committed by Git OBS Bridge
parent 99e2fe661b
commit c8078b5725
5 changed files with 73 additions and 74 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fa7bc04c52ed8399c09194351b8468e42dbf5bc1d1e81d19fd5e4c1566fa344d
size 587537

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:29571d20d50b139a3d4065e49cd93299272ff29988d54e553f29166860c083b6
size 586141

View File

@ -1,44 +0,0 @@
This patch is an ugly hack and should be removed ASAP.
Many GNOME docs fail without it, it causes failing packages and it
causes failing rebuild of other packages.
================================================================================
--- xslt/docbook/omf/db2omf.xsl
+++ xslt/docbook/omf/db2omf.xsl
@@ -237,7 +237,7 @@
$info/publisher[@role='maintainer'] |
$info/authorgroup/*[@role='maintainer'] "/>
<xsl:if test="not($maintainers)">
- <xsl:message terminate="yes">
+ <xsl:message>
<xsl:text>db2omf: Could not construct the OMF maintainer element.&#x000A;</xsl:text>
<xsl:text> Add an author, corpauthor, editor, othercredit, or publisher&#x000A;</xsl:text>
<xsl:text> element with the role attribute set to "maintainer" to </xsl:text>
@@ -371,7 +371,7 @@
</date>
</xsl:when>
<xsl:otherwise>
- <xsl:message terminate="yes">
+ <xsl:message>
<xsl:text>db2omf: Could not construct the OMF date element.&#x000A;</xsl:text>
<xsl:text> Add either a revision element with revnumber and date,&#x000A;</xsl:text>
<xsl:text> or a date element to </xsl:text>
@@ -420,7 +420,7 @@
</version>
</xsl:when>
<xsl:otherwise>
- <xsl:message terminate="yes">
+ <xsl:message>
<xsl:text>db2omf: Could not construct the OMF version element.&#x000A;</xsl:text>
<xsl:text> Add either a revision element with revnumber and date,&#x000A;</xsl:text>
<xsl:text> or date and edition elements to </xsl:text>
@@ -484,7 +484,7 @@
= 'info']"/>
<xsl:variable name="description" select="$info/abstract[@role = 'description']"/>
<xsl:if test="not($description)">
- <xsl:message terminate="yes">
+ <xsl:message>
<xsl:text>db2omf: Could not construct the OMF description element.&#x000A;</xsl:text>
<xsl:text> Add an abstract with the role attribute set to "description"&#x000A;</xsl:text>
<xsl:text> to </xsl:text>

View File

@ -1,3 +1,22 @@
-------------------------------------------------------------------
Mon Mar 9 14:55:31 CET 2009 - vuntz@novell.com
- Split off a lang package.
- Put back scrollkeeper in Requires (of the devel package this
time). It's really needed.
- Move some files to the devel package, where they belong.
-------------------------------------------------------------------
Mon Mar 2 23:15:21 CET 2009 - mboman@suse.de
- Update to version 0.15.2:
+ More RTL fixes for bgo#563559
+ Translation updates
- Completly remove gnome-doc-utils-permissive.patch
- Remove scrollkeeper from BuildRequires/Requires
- Remove AutoReqProv since it's default
- Add libxslt to Requires
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Feb 2 15:47:13 EST 2009 - mboman@suse.de Mon Feb 2 15:47:13 EST 2009 - mboman@suse.de

View File

@ -1,5 +1,5 @@
# #
# spec file for package gnome-doc-utils (Version 0.15.1) # spec file for package gnome-doc-utils (Version 0.15.2)
# #
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
@ -27,19 +27,15 @@ BuildRequires: pkg-config
BuildRequires: python BuildRequires: python
License: GPL v2 or later; LGPL v2.1 or later License: GPL v2 or later; LGPL v2.1 or later
Group: System/GUI/GNOME Group: System/GUI/GNOME
AutoReqProv: on Version: 0.15.2
Version: 0.15.1
Release: 1 Release: 1
Summary: A Collection of Documentation Utilities for GNOME Summary: A Collection of Documentation Utilities for GNOME
Source: ftp://ftp.gnome.org/pub/GNOME/sources/gnome-doc-utils/0.8/%{name}-%{version}.tar.bz2 Source: ftp://ftp.gnome.org/pub/GNOME/sources/gnome-doc-utils/0.8/%{name}-%{version}.tar.bz2
# PATCH-FIX-OPENSUSE gnome-doc-utils-permissive.patch -- Be permissive for incorrectly formatted docs, so that builds don't fail. Should be removed ASAP.
Patch: gnome-doc-utils-permissive.patch
Url: http://www.gnome.org Url: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: libxml2-python Requires: libxml2-python
# only for directory ownership: Requires: libxslt
BuildRequires: scrollkeeper Requires: %{name}-lang = %{version}
Requires: scrollkeeper
BuildArch: noarch BuildArch: noarch
%description %description
@ -70,8 +66,10 @@ Authors:
License: GPL v2 or later; LGPL v2.1 or later License: GPL v2 or later; LGPL v2.1 or later
Summary: A Collection of Documentation Utilities for GNOME Summary: A Collection of Documentation Utilities for GNOME
Group: System/GUI/GNOME Group: System/GUI/GNOME
AutoReqProv: on Requires: %{name} = %{version}
Requires: %{name} = %{version} libxml2-devel # Needed by packages being built with gnome-doc-utils, unless they
# use --disable-scrollkeeper
Requires: scrollkeeper
%description devel %description devel
The gnome-doc-utils package is a collection of documentation utilities The gnome-doc-utils package is a collection of documentation utilities
@ -98,10 +96,9 @@ Authors:
-------- --------
Shaun McCance <shaunm@gnome.org> Shaun McCance <shaunm@gnome.org>
%lang_package
%prep %prep
%setup -q %setup -q
# This patch is an ugly hack and should be removed ASAP:
#%patch
%build %build
# autoreconf fails... # autoreconf fails...
@ -120,25 +117,52 @@ make %{?jobs:-j%jobs} pkgconfigdir=%{_datadir}/pkgconfig
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
%files -f %{name}.lang %files
%defattr(-,root,root) %defattr(-,root,root)
%doc AUTHORS COPYING ChangeLog NEWS README %doc AUTHORS COPYING ChangeLog NEWS README
%{_bindir}/* # xml2po stuff
%{_datadir}/aclocal/gnome-doc-utils.m4 %{_bindir}/xml2po
%{_datadir}/gnome-doc-utils
%{_datadir}/xml/*
%{_datadir}/omf/*
%{_datadir}/xml2po %{_datadir}/xml2po
# gnome-doc-tool stuff
%{_bindir}/gnome-doc-tool
%dir %{_datadir}/gnome-doc-utils
%{_datadir}/gnome-doc-utils/icons
%{_datadir}/gnome-doc-utils/watermarks
%{_datadir}/xml/gnome
# Misc.
%{_mandir}/man?/*.* %{_mandir}/man?/*.*
# Own these directories to not depend on gnome-common while building:
%dir %{_datadir}/gnome
%dir %{_datadir}/gnome/help
%files devel %files devel
%defattr (-, root, root) %defattr (-, root, root)
%{_bindir}/gnome-doc-prepare
%{_datadir}/aclocal/gnome-doc-utils.m4
%{_datadir}/pkgconfig/*.pc %{_datadir}/pkgconfig/*.pc
%{_datadir}/gnome-doc-utils/gnome-doc-utils.make
%{_datadir}/gnome-doc-utils/templates
%{_datadir}/gnome-doc-utils/template*.*
%files lang -f %{name}.lang
%defattr (-, root, root)
# Own these directories to not depend on gnome-common while building:
%dir %{_datadir}/gnome
%dir %{_datadir}/gnome/help
# Own this directory to not depend on scrollkeeper
%dir %{_datadir}/omf
%changelog %changelog
* Mon Mar 09 2009 vuntz@novell.com
- Split off a lang package.
- Put back scrollkeeper in Requires (of the devel package this
time). It's really needed.
- Move some files to the devel package, where they belong.
* Mon Mar 02 2009 mboman@suse.de
- Update to version 0.15.2:
+ More RTL fixes for bgo#563559
+ Translation updates
- Completly remove gnome-doc-utils-permissive.patch
- Remove scrollkeeper from BuildRequires/Requires
- Remove AutoReqProv since it's default
- Add libxslt to Requires
* Mon Feb 02 2009 mboman@suse.de * Mon Feb 02 2009 mboman@suse.de
- Update to version 0.15.1: - Update to version 0.15.1:
+ Fixed some RTL issues, thanks to muayyad alsadi, bgo#563559 + Fixed some RTL issues, thanks to muayyad alsadi, bgo#563559
@ -158,10 +182,10 @@ rm -rf $RPM_BUILD_ROOT
+ chmod +x gnome-doc-{tool,prepare} on configure, bgo#557732 + chmod +x gnome-doc-{tool,prepare} on configure, bgo#557732
+ Symlink non-localized figured to C figures, bgo#557227 + Symlink non-localized figured to C figures, bgo#557227
+ Translation updates + Translation updates
* Tue Sep 23 2008 mboman@suse.de * Wed Sep 24 2008 mboman@suse.de
- Update to version 0.14.0: - Update to version 0.14.0:
+ Translation updates. + Translation updates.
* Thu Sep 04 2008 maw@suse.de * Fri Sep 05 2008 maw@suse.de
- Don't require glib2-devel to build. - Don't require glib2-devel to build.
- Do require pkg-config to build. - Do require pkg-config to build.
* Sat Aug 30 2008 mboman@novell.com * Sat Aug 30 2008 mboman@novell.com
@ -176,7 +200,7 @@ rm -rf $RPM_BUILD_ROOT
- Tag patch. - Tag patch.
- Add gnome-doc-utils-bnc408363-unicodeerror.patch to fix an error - Add gnome-doc-utils-bnc408363-unicodeerror.patch to fix an error
in xml2po (bnc#408363). in xml2po (bnc#408363).
* Thu Mar 13 2008 maw@suse.de * Fri Mar 14 2008 maw@suse.de
- Update to version 0.12.2: - Update to version 0.12.2:
+ Added DOCTYPE decls to HTML and XHTML pages + Added DOCTYPE decls to HTML and XHTML pages
+ Adde EXSLT set to the excluded prefixes + Adde EXSLT set to the excluded prefixes
@ -202,7 +226,7 @@ rm -rf $RPM_BUILD_ROOT
* Thu Aug 02 2007 mauro@suse.de * Thu Aug 02 2007 mauro@suse.de
- Update to version 0.11.1 - Update to version 0.11.1
- Bugfixes for #456700. - Bugfixes for #456700.
* Wed Apr 11 2007 maw@suse.de * Thu Apr 12 2007 maw@suse.de
- Update to version 0.10.3 - Update to version 0.10.3
* general: * general:
Use gawk -W compat whenever $(AWK) is gawk (Shaun McCance) Use gawk -W compat whenever $(AWK) is gawk (Shaun McCance)
@ -275,9 +299,9 @@ rm -rf $RPM_BUILD_ROOT
- Update to version 0.2.0 - Update to version 0.2.0
* Wed Mar 09 2005 gekker@suse.de * Wed Mar 09 2005 gekker@suse.de
- Updating to version 0.1.3 (GNOME 2.10). - Updating to version 0.1.3 (GNOME 2.10).
* Wed Feb 02 2005 clahey@suse.de * Thu Feb 03 2005 clahey@suse.de
- Updating to version 0.1.2. - Updating to version 0.1.2.
* Mon Jan 24 2005 ro@suse.de * Mon Jan 24 2005 ro@suse.de
- fix lib64 build - fix lib64 build
* Sun Jan 23 2005 clahey@suse.de * Mon Jan 24 2005 clahey@suse.de
- Initial import. - Initial import.