Drop the requirement on docbook5-style-xsl as it will be removed from RHEL.
As it was used to build the man page, add the man page in the native format. Resolves: RHEL-45565
This commit is contained in:
parent
ab8928c6ed
commit
01bf4b22d0
225
drop-docbook5-style-xsl.patch
Normal file
225
drop-docbook5-style-xsl.patch
Normal file
@ -0,0 +1,225 @@
|
|||||||
|
From b0f7fc9293e6ee2d42ebd85ac6c1c8fe15353a8a Mon Sep 17 00:00:00 2001
|
||||||
|
From: rpm-build <rpm-build>
|
||||||
|
Date: Wed, 17 Jul 2024 11:00:42 +0200
|
||||||
|
Subject: [PATCH] drop-docbook5-style-xsl.patch
|
||||||
|
|
||||||
|
---
|
||||||
|
docs/meson.build | 7 +--
|
||||||
|
docs/notify-send.1 | 141 +++++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
meson.build | 21 -------
|
||||||
|
meson_options.txt | 2 +-
|
||||||
|
4 files changed, 143 insertions(+), 28 deletions(-)
|
||||||
|
create mode 100644 docs/notify-send.1
|
||||||
|
|
||||||
|
diff --git a/docs/meson.build b/docs/meson.build
|
||||||
|
index 4c5ba64..bd44664 100644
|
||||||
|
--- a/docs/meson.build
|
||||||
|
+++ b/docs/meson.build
|
||||||
|
@@ -30,11 +30,6 @@ if get_option('man')
|
||||||
|
manpages = ['notify-send']
|
||||||
|
|
||||||
|
foreach page : manpages
|
||||||
|
- custom_target(page + '-man',
|
||||||
|
- input: page + '.xml',
|
||||||
|
- output: page + '.1',
|
||||||
|
- command: xsltproc_command,
|
||||||
|
- install: true,
|
||||||
|
- install_dir: man1dir)
|
||||||
|
+ install_man(page + '.1')
|
||||||
|
endforeach
|
||||||
|
endif
|
||||||
|
diff --git a/docs/notify-send.1 b/docs/notify-send.1
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000..fb58424
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/docs/notify-send.1
|
||||||
|
@@ -0,0 +1,141 @@
|
||||||
|
+'\" t
|
||||||
|
+.\" Title: notify-send
|
||||||
|
+.\" Author: Andre Filipe de Assuncao e Brito <decko@noisemakers.org>
|
||||||
|
+.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
|
||||||
|
+.\" Date: November 2005
|
||||||
|
+.\" Manual: User Commands
|
||||||
|
+.\" Source: libnotify
|
||||||
|
+.\" Language: English
|
||||||
|
+.\"
|
||||||
|
+.TH "NOTIFY\-SEND" "1" "" "libnotify" "User Commands"
|
||||||
|
+.\" -----------------------------------------------------------------
|
||||||
|
+.\" * Define some portability stuff
|
||||||
|
+.\" -----------------------------------------------------------------
|
||||||
|
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
+.\" http://bugs.debian.org/507673
|
||||||
|
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
|
||||||
|
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
+.ie \n(.g .ds Aq \(aq
|
||||||
|
+.el .ds Aq '
|
||||||
|
+.\" -----------------------------------------------------------------
|
||||||
|
+.\" * set default formatting
|
||||||
|
+.\" -----------------------------------------------------------------
|
||||||
|
+.\" disable hyphenation
|
||||||
|
+.nh
|
||||||
|
+.\" disable justification (adjust text to left margin only)
|
||||||
|
+.ad l
|
||||||
|
+.\" -----------------------------------------------------------------
|
||||||
|
+.\" * MAIN CONTENT STARTS HERE *
|
||||||
|
+.\" -----------------------------------------------------------------
|
||||||
|
+.SH "NAME"
|
||||||
|
+notify-send \- a program to send desktop notifications
|
||||||
|
+.SH "SYNOPSIS"
|
||||||
|
+.HP \w'\fBnotify\-send\fR\ 'u
|
||||||
|
+\fBnotify\-send\fR [\fIOPTIONS\fR] {\fIsummary\fR} [\fIbody\fR]
|
||||||
|
+.SH "DESCRIPTION"
|
||||||
|
+.PP
|
||||||
|
+With
|
||||||
|
+\fBnotify\-send\fR
|
||||||
|
+you can send desktop notifications to the user via a notification daemon from the command line\&. These notifications can be used to inform the user about an event or display some form of information without getting in the user\(cqs way\&.
|
||||||
|
+.SH "OPTIONS"
|
||||||
|
+.PP
|
||||||
|
+\fB\-?\fR, \fB\-\-help\fR
|
||||||
|
+.RS 4
|
||||||
|
+Show help and exit\&.
|
||||||
|
+.RE
|
||||||
|
+.PP
|
||||||
|
+\fB\-a\fR, \fB\-\-app\-name\fR=\fIAPP_NAME\fR
|
||||||
|
+.RS 4
|
||||||
|
+Specifies the app name for the notification\&.
|
||||||
|
+.RE
|
||||||
|
+.PP
|
||||||
|
+\fB\-A\fR, \fB\-\-action\fR=[\fINAME\fR=]\fIText\&.\&.\&.\fR
|
||||||
|
+.RS 4
|
||||||
|
+Specifies the actions to display to the user\&. Implies
|
||||||
|
+\fB\-\-wait\fR
|
||||||
|
+to wait for user input\&. May be set multiple times\&. The
|
||||||
|
+\fINAME\fR
|
||||||
|
+of the action is output to
|
||||||
|
+stdout\&. If
|
||||||
|
+\fINAME\fR
|
||||||
|
+is not specified, the numerical index of the option is used (starting with
|
||||||
|
+1)\&.
|
||||||
|
+.RE
|
||||||
|
+.PP
|
||||||
|
+\fB\-u\fR, \fB\-\-urgency\fR=\fILEVEL\fR
|
||||||
|
+.RS 4
|
||||||
|
+Specifies the urgency level (low,
|
||||||
|
+normal,
|
||||||
|
+critical)\&.
|
||||||
|
+.RE
|
||||||
|
+.PP
|
||||||
|
+\fB\-t\fR, \fB\-\-expire\-time\fR=\fITIME\fR
|
||||||
|
+.RS 4
|
||||||
|
+The duration, in milliseconds, for the notification to appear on screen\&.
|
||||||
|
+.sp
|
||||||
|
+Not all implementations use this parameter\&. GNOME Shell and Notify OSD always ignore it, while Plasma ignores it for notifications with the critical urgency level\&.
|
||||||
|
+.RE
|
||||||
|
+.PP
|
||||||
|
+\fB\-i\fR, \fB\-\-icon\fR=\fIICON\fR
|
||||||
|
+.RS 4
|
||||||
|
+Specifies an icon filename or stock icon to display\&.
|
||||||
|
+.RE
|
||||||
|
+.PP
|
||||||
|
+\fB\-c\fR, \fB\-\-category\fR=\fITYPE\fR[,\fITYPE\fR\&...]
|
||||||
|
+.RS 4
|
||||||
|
+Specifies the notification category\&.
|
||||||
|
+.RE
|
||||||
|
+.PP
|
||||||
|
+\fB\-h\fR, \fB\-\-hint\fR=\fITYPE\fR:\fINAME\fR:\fIVALUE\fR
|
||||||
|
+.RS 4
|
||||||
|
+Specifies basic extra data to pass\&. Valid types are
|
||||||
|
+BOOLEAN,
|
||||||
|
+INT,
|
||||||
|
+DOUBLE,
|
||||||
|
+STRING,
|
||||||
|
+BYTE
|
||||||
|
+and
|
||||||
|
+VARIANT\&.
|
||||||
|
+.RE
|
||||||
|
+.PP
|
||||||
|
+\fB\-p\fR, \fB\-\-print\-id\fR
|
||||||
|
+.RS 4
|
||||||
|
+Print the notification ID\&.
|
||||||
|
+.RE
|
||||||
|
+.PP
|
||||||
|
+\fB\-r\fR, \fB\-\-replace\-id\fR=\fIREPLACE_ID\fR
|
||||||
|
+.RS 4
|
||||||
|
+The ID of the notification to replace\&.
|
||||||
|
+.RE
|
||||||
|
+.PP
|
||||||
|
+\fB\-w\fR, \fB\-\-wait\fR
|
||||||
|
+.RS 4
|
||||||
|
+Wait for the notification to be closed before exiting\&. If the
|
||||||
|
+\fBexpire\-time\fR
|
||||||
|
+is set, it will be used as the maximum waiting time\&.
|
||||||
|
+.RE
|
||||||
|
+.PP
|
||||||
|
+\fB\-e\fR, \fB\-\-transient\fR
|
||||||
|
+.RS 4
|
||||||
|
+Show a transient notification\&. Transient notifications by\-pass the server\*(Aqs persistence capability, if any\&. And so it won\*(Aqt be preserved until the user acknowledges it\&.
|
||||||
|
+.RE
|
||||||
|
+.SH "SEE ALSO"
|
||||||
|
+.PP
|
||||||
|
+The Desktop Notification Spec on
|
||||||
|
+\m[blue]\fBhttps://specifications\&.freedesktop\&.org/notification\-spec/\fR\m[]\&.
|
||||||
|
+.SH "AUTHORS"
|
||||||
|
+.PP
|
||||||
|
+\fBAndre Filipe de Assuncao e Brito\fR <\&decko@noisemakers\&.org\&>
|
||||||
|
+.RS 4
|
||||||
|
+Original author
|
||||||
|
+.RE
|
||||||
|
+.PP
|
||||||
|
+\fBPaul van Tilburg\fR <\&paulvt@debian\&.org\&>
|
||||||
|
+.RS 4
|
||||||
|
+Original author
|
||||||
|
+.RE
|
||||||
|
+.PP
|
||||||
|
+\fBRiccardo Setti\fR <\&giskard@debian\&.org\&>
|
||||||
|
+.RS 4
|
||||||
|
+Original author
|
||||||
|
+.RE
|
||||||
|
diff --git a/meson.build b/meson.build
|
||||||
|
index 82e796a..9c3fe81 100644
|
||||||
|
--- a/meson.build
|
||||||
|
+++ b/meson.build
|
||||||
|
@@ -55,27 +55,6 @@ configure_file(input: 'config.h.meson',
|
||||||
|
output : 'config.h',
|
||||||
|
configuration : conf)
|
||||||
|
|
||||||
|
-if get_option('man')
|
||||||
|
- xsltproc = find_program('xsltproc', required: true)
|
||||||
|
- stylesheet = 'http://docbook.sourceforge.net/release/xsl-ns/current/manpages/docbook.xsl'
|
||||||
|
- xsltproc_command = [
|
||||||
|
- xsltproc,
|
||||||
|
- '--nonet',
|
||||||
|
- '--stringparam', 'man.output.quietly', '1',
|
||||||
|
- '--stringparam', 'funcsynopsis.style', 'ansi',
|
||||||
|
- '--stringparam', 'man.th.extra1.suppress', '1',
|
||||||
|
- '-o', '@OUTPUT@',
|
||||||
|
- stylesheet,
|
||||||
|
- '@INPUT@',
|
||||||
|
- ]
|
||||||
|
-
|
||||||
|
- testrun = run_command(xsltproc, '--nonet', stylesheet, check: false)
|
||||||
|
-
|
||||||
|
- if testrun.returncode() != 0
|
||||||
|
- error('DocBook stylesheet for generating man pages not found, you need to install docbook-xsl-ns or similar package.')
|
||||||
|
- endif
|
||||||
|
-endif
|
||||||
|
-
|
||||||
|
subdir('libnotify')
|
||||||
|
subdir('tools')
|
||||||
|
subdir('docs')
|
||||||
|
diff --git a/meson_options.txt b/meson_options.txt
|
||||||
|
index d20d16d..fb0f005 100644
|
||||||
|
--- a/meson_options.txt
|
||||||
|
+++ b/meson_options.txt
|
||||||
|
@@ -9,7 +9,7 @@ option('introspection',
|
||||||
|
option('man',
|
||||||
|
type: 'boolean',
|
||||||
|
value: true,
|
||||||
|
- description: 'Enable generating the manual page (depends on xsltproc)')
|
||||||
|
+ description: 'Install the manual page')
|
||||||
|
option('gtk_doc',
|
||||||
|
type: 'boolean',
|
||||||
|
value: true,
|
||||||
|
--
|
||||||
|
2.45.1
|
||||||
|
|
@ -2,17 +2,18 @@
|
|||||||
|
|
||||||
Name: libnotify
|
Name: libnotify
|
||||||
Version: 0.8.3
|
Version: 0.8.3
|
||||||
Release: 4%{?dist}
|
Release: 5%{?dist}
|
||||||
Summary: Desktop notification library
|
Summary: Desktop notification library
|
||||||
|
|
||||||
License: LGPL-2.1-or-later
|
License: LGPL-2.1-or-later
|
||||||
URL: https://gitlab.gnome.org/GNOME/libnotify
|
URL: https://gitlab.gnome.org/GNOME/libnotify
|
||||||
Source0: https://download.gnome.org/sources/libnotify/0.8/%{name}-%{version}.tar.xz
|
Source0: https://download.gnome.org/sources/libnotify/0.8/%{name}-%{version}.tar.xz
|
||||||
|
|
||||||
|
Patch0: drop-docbook5-style-xsl.patch
|
||||||
|
|
||||||
BuildRequires: pkgconfig(gdk-pixbuf-2.0)
|
BuildRequires: pkgconfig(gdk-pixbuf-2.0)
|
||||||
BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version}
|
BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version}
|
||||||
BuildRequires: pkgconfig(gobject-introspection-1.0)
|
BuildRequires: pkgconfig(gobject-introspection-1.0)
|
||||||
BuildRequires: docbook-xsl-ns
|
|
||||||
BuildRequires: gi-docgen
|
BuildRequires: gi-docgen
|
||||||
BuildRequires: meson
|
BuildRequires: meson
|
||||||
BuildRequires: xmlto
|
BuildRequires: xmlto
|
||||||
@ -62,6 +63,11 @@ development of programs using %{name}.
|
|||||||
%doc %{_docdir}/libnotify/spec/
|
%doc %{_docdir}/libnotify/spec/
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Jul 17 2024 Tomas Popela <tpopela@redhat.com> - 0.8.3-5
|
||||||
|
- Drop the requirement on docbook5-style-xsl as it will be removed from RHEL.
|
||||||
|
As it was used to build the man page, add the man page in the native format.
|
||||||
|
- Resolves: RHEL-45565
|
||||||
|
|
||||||
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 0.8.3-4
|
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 0.8.3-4
|
||||||
- Bump release for June 2024 mass rebuild
|
- Bump release for June 2024 mass rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user