Skip to content

Commit

Permalink
spec + exclude_files file: Sync *.spec from OBS, remove exclude-file
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
Stefan Knorr committed May 11, 2021
1 parent 05c7d54 commit 8301ac1
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 89 deletions.
19 changes: 0 additions & 19 deletions packaging/EXCLUDES-README

This file was deleted.

55 changes: 8 additions & 47 deletions packaging/daps.spec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#
# spec file for package daps
#
# Copyright (c) 2020 SUSE LLC
# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
Expand All @@ -17,37 +17,17 @@


Name: daps
Version: 3.0.0
Version: 3.1.0
Release: 0

###############################################################
#
# ATTENTION: Do NOT edit this file outside of
# https://github.com/openSUSE/daps/blob/main/packaging/daps.spec
#
# Your changes will be lost on the next update
# If you do not have access to the GitHub repository, notify
# <[email protected]> or <[email protected]>
# or send a patch
#
################################################################
#
# Please submit bugfixes or comments via
# https://github.com/openSUSE/daps/issues
#

%define docbuilddir %{_datadir}/daps
%define regcat %{_bindir}/sgml-register-catalog
%define dbstyles %{_datadir}/xml/docbook/stylesheet/nwalsh/current
%define daps_catalog for-catalog-%{name}.xml

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

BuildArch: noarch
Expand All @@ -58,6 +38,7 @@ BuildRequires: bash >= 4
BuildRequires: dia
BuildRequires: docbook-xsl-stylesheets >= 1.77
BuildRequires: docbook_4
BuildRequires: docbook_5
BuildRequires: fdupes
BuildRequires: ghostscript
BuildRequires: inkscape
Expand All @@ -73,21 +54,8 @@ BuildRequires: xerces-j2
BuildRequires: xml-apis
BuildRequires: xmlgraphics-fop >= 0.94
BuildRequires: xmlstarlet

# Asciidoctor is not available on Leap 42.3
# If we have asciidoctor we build the asciidoc manual
# for which we need docbook_5 and jing
#
%if 0%{?sle_version} == 120300 && 0%{?is_opensuse}
Recommends: rubygem(%{rb_default_ruby_abi}:asciidoctor)
%else
Requires: rubygem(%{rb_default_ruby_abi}:asciidoctor)
BuildRequires: docbook_5
BuildRequires: jing
BuildRequires: rubygem(%{rb_default_ruby_abi}:asciidoctor)
%endif

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

Recommends: aspell-en
Recommends: calibre
Expand All @@ -136,10 +105,7 @@ Recommends: w3m
Recommends: xmlformat

# Internal XEP package:
Recommends: xep

Obsoletes: susedoc < 4.3.32
Provides: susedoc = 4.3.32
Suggests: xep

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

DAPS also includes tools that assist you when writing DocBook XML:
linkchecker, validator, spellchecker, editor macros and stylesheets for
validator, link checker, spellchecker, editor macros and stylesheets for
converting DocBook XML.

DAPS is the successor of susedoc. See
/usr/share/doc/packages/daps/README.upgrade_from_susedoc_4.x
for upgrade instructions.


#--------------------------------------------------------------------------
%prep
%setup -q -n %{name}
#%%patch1 -p1
%setup -q -n %{name}-%{version}

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

#--------------------------------------------------------------------------
%install
Expand Down
23 changes: 0 additions & 23 deletions packaging/exclude-files_for_daps_package.txt

This file was deleted.

0 comments on commit 8301ac1

Please sign in to comment.