Skip to content

Commit 8301ac1

Browse files
author
Stefan Knorr
committed
spec + exclude_files file: Sync *.spec from OBS, remove exclude-file
The exclude file used to list parts of the repo that were not useful for the TAR archive. However, we're now using a .gitattributes file in the root directory of the repo for that purpose.
1 parent 05c7d54 commit 8301ac1

File tree

3 files changed

+8
-89
lines changed

3 files changed

+8
-89
lines changed

packaging/EXCLUDES-README

-19
This file was deleted.

packaging/daps.spec

+8-47
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# spec file for package daps
33
#
4-
# Copyright (c) 2020 SUSE LLC
4+
# Copyright (c) 2021 SUSE LLC
55
#
66
# All modifications and additions to the file contributed by third parties
77
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,37 +17,17 @@
1717

1818

1919
Name: daps
20-
Version: 3.0.0
20+
Version: 3.1.0
2121
Release: 0
2222

23-
###############################################################
24-
#
25-
# ATTENTION: Do NOT edit this file outside of
26-
# https://github.com/openSUSE/daps/blob/main/packaging/daps.spec
27-
#
28-
# Your changes will be lost on the next update
29-
# If you do not have access to the GitHub repository, notify
30-
# <fsundermeyer@opensuse.org> or <toms@opensuse.org>
31-
# or send a patch
32-
#
33-
################################################################
34-
#
35-
# Please submit bugfixes or comments via
36-
# https://github.com/openSUSE/daps/issues
37-
#
38-
3923
%define docbuilddir %{_datadir}/daps
40-
%define regcat %{_bindir}/sgml-register-catalog
41-
%define dbstyles %{_datadir}/xml/docbook/stylesheet/nwalsh/current
42-
%define daps_catalog for-catalog-%{name}.xml
4324

4425
Summary: DocBook Authoring and Publishing Suite
4526
License: GPL-2.0-only OR GPL-3.0-only
4627
Group: Productivity/Publishing/XML
4728
URL: https://github.com/openSUSE/daps
4829
Source0: %{name}-%{version}.tar.bz2
4930
Source1: %{name}.rpmlintrc
50-
Source2: %{name}-fetch-source-git
5131
BuildRoot: %{_tmppath}/%{name}-%{version}-build
5232

5333
BuildArch: noarch
@@ -58,6 +38,7 @@ BuildRequires: bash >= 4
5838
BuildRequires: dia
5939
BuildRequires: docbook-xsl-stylesheets >= 1.77
6040
BuildRequires: docbook_4
41+
BuildRequires: docbook_5
6142
BuildRequires: fdupes
6243
BuildRequires: ghostscript
6344
BuildRequires: inkscape
@@ -73,21 +54,8 @@ BuildRequires: xerces-j2
7354
BuildRequires: xml-apis
7455
BuildRequires: xmlgraphics-fop >= 0.94
7556
BuildRequires: xmlstarlet
76-
77-
# Asciidoctor is not available on Leap 42.3
78-
# If we have asciidoctor we build the asciidoc manual
79-
# for which we need docbook_5 and jing
80-
#
81-
%if 0%{?sle_version} == 120300 && 0%{?is_opensuse}
82-
Recommends: rubygem(%{rb_default_ruby_abi}:asciidoctor)
83-
%else
84-
Requires: rubygem(%{rb_default_ruby_abi}:asciidoctor)
85-
BuildRequires: docbook_5
86-
BuildRequires: jing
8757
BuildRequires: rubygem(%{rb_default_ruby_abi}:asciidoctor)
88-
%endif
8958

90-
#
9159
# In order to keep the requirements list as short as possible, only packages
9260
# needed to build EPUB, HTML and PDF are really required
9361
# All other packages required for editing or more exotic output formats
@@ -118,6 +86,7 @@ Requires: xml-apis
11886
Requires: xmlgraphics-fop >= 0.94
11987
Requires: xmlstarlet
12088
Requires: zip
89+
Requires: rubygem(%{rb_default_ruby_abi}:asciidoctor)
12190

12291
Recommends: aspell-en
12392
Recommends: calibre
@@ -136,10 +105,7 @@ Recommends: w3m
136105
Recommends: xmlformat
137106

138107
# Internal XEP package:
139-
Recommends: xep
140-
141-
Obsoletes: susedoc < 4.3.32
142-
Provides: susedoc = 4.3.32
108+
Suggests: xep
143109

144110
%description
145111
DocBook Authoring and Publishing Suite (DAPS)
@@ -150,18 +116,13 @@ single command. It also contains tools to generate profiled source
150116
tarballs for distributing your XML sources for translation or review.
151117

152118
DAPS also includes tools that assist you when writing DocBook XML:
153-
linkchecker, validator, spellchecker, editor macros and stylesheets for
119+
validator, link checker, spellchecker, editor macros and stylesheets for
154120
converting DocBook XML.
155121

156-
DAPS is the successor of susedoc. See
157-
/usr/share/doc/packages/daps/README.upgrade_from_susedoc_4.x
158-
for upgrade instructions.
159-
160122

161123
#--------------------------------------------------------------------------
162124
%prep
163-
%setup -q -n %{name}
164-
#%%patch1 -p1
125+
%setup -q -n %{name}-%{version}
165126

166127
# Correct shebang line as suggested in
167128
# https://lists.opensuse.org/opensuse-packaging/2018-03/msg00017.html
@@ -170,7 +131,7 @@ sed -i '1 s|/usr/bin/env python|/usr/bin/python|' libexec/daps-xmlwellformed
170131
#--------------------------------------------------------------------------
171132
%build
172133
%configure --docdir=%{_defaultdocdir}/%{name} --disable-edit-rootcatalog
173-
%__make %{?_smp_mflags}
134+
%__make %{?_smp_mflags}
174135

175136
#--------------------------------------------------------------------------
176137
%install

packaging/exclude-files_for_daps_package.txt

-23
This file was deleted.

0 commit comments

Comments
 (0)