Compare commits

...

No commits in common. "c8" and "c10s" have entirely different histories.
c8 ... c10s

18 changed files with 180 additions and 18 deletions

View File

@ -1,2 +0,0 @@
e6d847ff26d46f5ab368e9dd76c95acf15c95a72 SOURCES/docbook-xsl-doc-1.79.2.tar.bz2
fb4f60b3968777b5a794d1e1f9e5867b04517425 SOURCES/docbook-xsl-nons-1.79.2.tar.bz2

1
.fmf/version Normal file
View File

@ -0,0 +1 @@
1

18
.gitignore vendored
View File

@ -1,2 +1,16 @@
SOURCES/docbook-xsl-doc-1.79.2.tar.bz2
SOURCES/docbook-xsl-nons-1.79.2.tar.bz2
docbook-xsl-1.75.2.tar.bz2
docbook-xsl-doc-1.75.2.tar.bz2
/docbook-xsl-1.76.0.tar.bz2
/docbook-xsl-doc-1.76.0.tar.bz2
/docbook-xsl-1.76.1.tar.bz2
/docbook-xsl-doc-1.76.1.tar.bz2
/docbook-xsl-1.77.1.tar.bz2
/docbook-xsl-doc-1.77.1.tar.bz2
/docbook-xsl-doc-1.78.0.tar.bz2
/docbook-xsl-1.78.0.tar.bz2
/docbook-xsl-doc-1.78.1.tar.bz2
/docbook-xsl-1.78.1.tar.bz2
/docbook-xsl-1.79.1.tar.bz2
/docbook-xsl-doc-1.79.1.tar.bz2
/docbook-xsl-nons-1.79.2.tar.bz2
/docbook-xsl-doc-1.79.2.tar.bz2

View File

@ -0,0 +1,43 @@
---
apiVersion: tekton.dev/v1
kind: PipelineRun
metadata:
annotations:
build.appstudio.openshift.io/repo: '{{ source_url }}/-/tree/{{ revision }}'
build.appstudio.redhat.com/commit_sha: '{{ revision }}'
build.appstudio.redhat.com/pull_request_number: '{{ pull_request_number }}'
build.appstudio.redhat.com/target_branch: '{{ target_branch }}'
pipelinesascode.tekton.dev/max-keep-runs: "3"
pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request"
creationTimestamp: null
labels:
appstudio.openshift.io/application: rhel-10-workload-text-processing
appstudio.openshift.io/component: rhel-10-docbook-style-xsl
pipelines.appstudio.openshift.io/type: build
name: rhel-10-docbook-style-xsl-on-pull-request
namespace: rhel-sst-cs-database-tenant
spec:
params:
- name: application
value: rhel-10-workload-text-processing
- name: package-name
value: docbook-style-xsl
- name: git-url
value: "{{ source_url }}"
- name: revision
value: "{{ revision }}"
- name: target-branch
value: "{{ target_branch }}"
pipelineRef:
resolver: git
params:
- name: url
value: "https://gitlab.cee.redhat.com/rhel-on-konflux/rpmbuild-pipeline.git"
- name: revision
value: main
- name: pathInRepo
value: pipeline/build-rhel-package.yaml
workspaces:
- name: git-auth
secret:
secretName: '{{ git_auth_secret }}'

View File

@ -0,0 +1,42 @@
---
apiVersion: tekton.dev/v1
kind: PipelineRun
metadata:
annotations:
build.appstudio.openshift.io/repo: '{{ source_url }}/-/tree/{{ revision }}'
build.appstudio.redhat.com/commit_sha: '{{ revision }}'
build.appstudio.redhat.com/target_branch: '{{ target_branch }}'
pipelinesascode.tekton.dev/max-keep-runs: "3"
pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch == "{{ target_branch }}"
creationTimestamp: null
labels:
appstudio.openshift.io/application: rhel-10-workload-text-processing
appstudio.openshift.io/component: rhel-10-docbook-style-xsl
pipelines.appstudio.openshift.io/type: build
name: rhel-10-docbook-style-xsl-on-push
namespace: rhel-sst-cs-database-tenant
spec:
params:
- name: application
value: rhel-10-workload-text-processing
- name: package-name
value: docbook-style-xsl
- name: git-url
value: "{{ source_url }}"
- name: revision
value: "{{ revision }}"
- name: target-branch
value: "{{ target_branch }}"
pipelineRef:
resolver: git
params:
- name: url
value: "https://gitlab.cee.redhat.com/rhel-on-konflux/rpmbuild-pipeline.git"
- name: revision
value: main
- name: pathInRepo
value: pipeline/build-rhel-package.yaml
workspaces:
- name: git-auth
secret:
secretName: '{{ git_auth_secret }}'

View File

@ -1,11 +1,10 @@
Name: docbook-style-xsl
Version: 1.79.2
Release: 9%{?dist}
Group: Applications/Text
Release: 25%{?dist}
Summary: Norman Walsh's XSL stylesheets for DocBook XML
License: DMIT
License: LicenseRef-DMIT
URL: https://github.com/docbook/xslt10-stylesheets
Provides: docbook-xsl = %{version}
@ -17,8 +16,8 @@ Requires(post): libxml2 >= 2.4.8
Requires(postun): libxml2 >= 2.4.8
# PassiveTeX before 1.21 can't handle the newer stylesheets.
Conflicts: passivetex < 1.21
BuildRequires: make
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildArch: noarch
Source0: https://github.com/docbook/xslt10-stylesheets/releases/download/release%2F{%version}/docbook-xsl-nons-%{version}.tar.bz2
@ -40,7 +39,8 @@ Patch5: docbook-xsl-list-item-body.patch
Patch6: docbook-xsl-mandir.patch
#Non-recursive string.subst that doesn't kill smb.conf.5 generation
Patch7: docbook-style-xsl-non-recursive-string-subst.patch
#Fix generate consistent IDs so it doesn't cause multilib conflicts (#1761964)
#Fix multilib problems with gtk-doc documentation
#https://github.com/docbook/xslt10-stylesheets/issues/54
Patch8: docbook-style-xsl-1.79.2-fix-gtk-doc-multilib.patch
%description
@ -62,7 +62,7 @@ popd
%patch5 -p1 -b .listitembody
%patch6 -p1 -b .mandir
%patch7 -p2 -b .non-recursive-subst
%patch8 -p1 -b .genconstids
%patch8 -p1 -b .gtk-doc-multilib
cp -p %{SOURCE1} Makefile
@ -95,12 +95,7 @@ ln -s xsl-stylesheets-%{version} \
rm -rf $DESTDIR%{_datadir}/sgml/docbook/xsl-stylesheets/extensions/*
%clean
DESTDIR=$RPM_BUILD_ROOT
rm -rf $RPM_BUILD_ROOT
%files
%defattr (-,root,root,-)
%doc BUGS
%doc README
%doc TODO
@ -142,8 +137,60 @@ if [ "$1" = 0 ]; then
fi
%changelog
* Wed Jan 20 2021 Ondrej Vasik <ovasik@redhat.com> - 1.79.2-9
- fix generate consistent IDs issue (#1761964)
* Mon Feb 17 2025 Tomas Kopecek <tkopecek@redhat.com> - 1.79.2-25
- Rebuild for Konflux
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.79.2-24
- Bump release for October 2024 mass rebuild:
Resolves: RHEL-64018
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.79.2-23
- Bump release for June 2024 mass rebuild
* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.79.2-22
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.79.2-21
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Mon Oct 23 2023 Ondrej Sloup <osloup@redhat.com> - 1.79.2-20
- Update license tag to the SPDX format
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.79.2-19
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.79.2-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.79.2-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.79.2-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.79.2-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.79.2-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Fri Jan 15 2021 David King <amigadave@amigadave.com> - 1.79.2-13
- Fix gtk-doc multilib failures
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.79.2-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.79.2-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.79.2-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.79.2-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.79.2-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.79.2-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
@ -537,7 +584,7 @@ fi
* Tue Jun 26 2001 Chris Runge <crunge@pobox.com>
- 1.40
* Fri Jun 09 2001 Chris Runge <crunge@pobox.com>
* Sat Jun 09 2001 Chris Runge <crunge@pobox.com>
- added extensions and additional doc
- bin added to doc; the Perl files are for Win32 Perl and so need some
conversion first

6
gating.yaml Normal file
View File

@ -0,0 +1,6 @@
--- !Policy
product_versions:
- rhel-10
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

9
plans/tier1-internal.fmf Normal file
View File

@ -0,0 +1,9 @@
summary: Internal Tier1 tests plan
discover:
how: fmf
url: https://pkgs.devel.redhat.com/git/tests/docbook-style-xsl
execute:
how: tmt
adjust:
enabled: false
when: distro == centos-stream or distro == fedora

2
sources Normal file
View File

@ -0,0 +1,2 @@
SHA512 (docbook-xsl-nons-1.79.2.tar.bz2) = d19aad5ae91c7f9a9690836bd472ec6e01a29eaeac6b1838b5c9ea54e2ef4cc90f515d7b6640fe94e909a5a51eee80cd32e2ccbee457de6f0c6652ea43325d7d
SHA512 (docbook-xsl-doc-1.79.2.tar.bz2) = 98390d47f0052913746b1449331c4aee9a710f500d4c844d89c72a1ee84212f74006abbd553c8d60ffd613df4bd298226bd4bcb23d8cca5df05545af45376f8e