diff --git a/SOURCES/gnome-photos-Add-a-manual.patch b/SOURCES/gnome-photos-Add-a-manual.patch new file mode 100644 index 0000000..e211808 --- /dev/null +++ b/SOURCES/gnome-photos-Add-a-manual.patch @@ -0,0 +1,276 @@ +From 1565368816f7cb4b34be21f5ef47f73940d6cf04 Mon Sep 17 00:00:00 2001 +From: Debarshi Ray +Date: Mon, 9 Nov 2020 23:42:46 +0100 +Subject: [PATCH] Add a manual + +https://gitlab.gnome.org/GNOME/gnome-photos/-/merge_requests/153 +--- + Makefile.am | 2 +- + configure.ac | 6 ++ + manuals/Makefile.am | 18 ++++ + manuals/gnome-photos.xml | 192 +++++++++++++++++++++++++++++++++++++++ + 4 files changed, 217 insertions(+), 1 deletion(-) + create mode 100644 manuals/Makefile.am + create mode 100644 manuals/gnome-photos.xml + +diff --git a/Makefile.am b/Makefile.am +index 0c7d8bff0cf1..7b19e62f5d62 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,6 +1,6 @@ + ACLOCAL_AMFLAGS = -I m4 -I libgd ${ACLOCAL_FLAGS} + +-SUBDIRS = . data libgd src po tests help ++SUBDIRS = . data libgd manuals src po tests help + + photosdocdir = $(docdir) + photosdoc_DATA = \ +diff --git a/configure.ac b/configure.ac +index 904a031c6ec1..5d511bba1390 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -149,6 +149,11 @@ if test -z "$DESKTOP_FILE_VALIDATE"; then + AC_MSG_ERROR([desktop-file-validate not found]) + fi + ++AC_PATH_PROG([XSLTPROC],[xsltproc],[]) ++if test -z "$XSLTPROC"; then ++ AC_MSG_ERROR([xsltproc not found]) ++fi ++ + ############################################# + #Documentation + ############################################# +@@ -163,6 +168,7 @@ data/org.gnome.Photos.desktop.in + data/icons/Makefile + help/Makefile + libgd/Makefile ++manuals/Makefile + src/Makefile + tests/Makefile + po/Makefile.in +diff --git a/manuals/Makefile.am b/manuals/Makefile.am +new file mode 100644 +index 000000000000..508c3cea2701 +--- /dev/null ++++ b/manuals/Makefile.am +@@ -0,0 +1,18 @@ ++XSLTPROC_FLAGS = \ ++ --nonet \ ++ --stringparam funcsynopsis.style ansi \ ++ --stringparam man.authors.section.enabled 0 \ ++ --stringparam man.copyright.section.enabled 0 \ ++ --stringparam man.output.quietly 1 ++ ++.xml.1: ++ $(AM_V_GEN) $(XSLTPROC) $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< ++ ++man_MANS = \ ++ gnome-photos.1 ++ ++xml_files = $(man_MANS:.1=.xml) ++ ++EXTRA_DIST = $(xml_files) ++ ++CLEANFILES = $(man_MANS) +diff --git a/manuals/gnome-photos.xml b/manuals/gnome-photos.xml +new file mode 100644 +index 000000000000..c370e31057c7 +--- /dev/null ++++ b/manuals/gnome-photos.xml +@@ -0,0 +1,192 @@ ++ ++ ++ ++ gnome-photos ++ November 2020 ++ GNOME ++ ++ ++ ++ gnome-photos ++ 1 ++ User Commands ++ ++ ++ ++ gnome-photos ++ Access, organize and share your photos on GNOME ++ ++ ++ ++ ++ gnome-photos ++ OPTION ++ ++ ++ ++ ++ ++ DESCRIPTION ++ ++ gnome-photos is an application to access, organize ++ and share your photos on GNOME. A simple and elegant replacement for ++ using a file manager to deal with photos. Enhance, crop and edit in a ++ snap. Seamless cloud integration is offered through GNOME Online ++ Accounts. ++ ++ ++ ++ ++ OPTIONS ++ ++ ++ ++ ++ ++ Show a brief overview of all the options. ++ ++ ++ ++ ++ ++ ++ ++ Show all the options in detail. ++ ++ ++ ++ ++ ++ ++ ++ Show all the GApplication options. ++ ++ ++ ++ ++ ++ ++ ++ Show all the GTK options. ++ ++ ++ ++ ++ ++ ++ ++ Show the empty state. ++ ++ ++ ++ ++ ++ ++ ++ Show the application's version. ++ ++ ++ ++ ++ ++ ++ ++ Enter GApplication service mode. To be used from D-Bus service ++ files. ++ ++ ++ ++ ++ ++ ++ ++ Program class as used by the window manager. ++ ++ ++ ++ ++ ++ ++ ++ X display to use. ++ ++ ++ ++ ++ ++ ++ ++ Make all warnings fatal. ++ ++ ++ ++ ++ ++ ++ ++ GDK debugging flags to set. ++ ++ ++ ++ ++ ++ ++ ++ GDK debugging flags to unset. ++ ++ ++ ++ ++ ++ ++ ++ GTK debugging flags to set. ++ ++ ++ ++ ++ ++ ++ ++ GTK debugging flags to unset. ++ ++ ++ ++ ++ ++ ++ ++ Load additional GTK modules. ++ ++ ++ ++ ++ ++ ++ ++ Program name as used by the window manager. ++ ++ ++ ++ ++ ++ ++ ++ BUGS ++ ++ Please send bug reports to either the distribution bug tracker or the ++ upstream bug tracker at ++ . ++ There are some debugging tips at ++ ++ ++ ++ ++ ++ SEE ALSO ++ ++ For further information, visit the website ++ . ++ ++ ++ +-- +2.28.0 + diff --git a/SPECS/gnome-photos.spec b/SPECS/gnome-photos.spec index ee8ee77..d00f129 100644 --- a/SPECS/gnome-photos.spec +++ b/SPECS/gnome-photos.spec @@ -11,7 +11,7 @@ Name: gnome-photos Version: 3.28.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Access, organize and share your photos on GNOME # GNOME Photos itself is GPLv3+, but the egg-* files and the @@ -23,9 +23,13 @@ Source0: http://download.gnome.org/sources/%{name}/3.28/%{name}-%{version} # https://bugzilla.redhat.com/show_bug.cgi?id=1605184 Patch0: gnome-photos-Build-against-gegl04.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=1612779 +Patch1: gnome-photos-Add-a-manual.patch + BuildRequires: autoconf automake gettext-devel libtool yelp-tools BuildRequires: pkgconfig(babl) BuildRequires: desktop-file-utils +BuildRequires: docbook-style-xsl BuildRequires: gettext >= %{gettext_version} BuildRequires: pkgconfig(cairo) >= %{cairo_version} BuildRequires: pkgconfig(cairo-gobject) >= %{cairo_version} @@ -43,6 +47,7 @@ BuildRequires: pkgconfig(libdazzle-1.0) BuildRequires: pkgconfig(libgdata) >= %{gdata_version} BuildRequires: pkgconfig(gexiv2) BuildRequires: libjpeg-turbo-devel +BuildRequires: libxslt BuildRequires: pkgconfig(tracker-control-2.0) >= %{tracker_version} BuildRequires: pkgconfig(tracker-sparql-2.0) >= %{tracker_version} BuildRequires: pkgconfig(libgfbgraph-0.2) @@ -84,6 +89,7 @@ This package contains the installable tests for %{name}. %prep %setup -q %patch0 -p1 +%patch1 -p1 pathfix.py -i %{__python3} -n tests/basic.py autoreconf -i -f @@ -113,6 +119,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Photos.desk %{_datadir}/gnome-shell/ %{_datadir}/icons/hicolor/*/apps/org.gnome.Photos.png %{_datadir}/icons/hicolor/scalable/apps/org.gnome.Photos-symbolic.svg +%{_datadir}/man/man1/%{name}.1* %{_docdir}/%{name} %{_libexecdir}/%{name}-thumbnailer @@ -122,6 +129,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Photos.desk %changelog +* Wed Nov 11 2020 Debarshi Ray - 3.28.1-4 +- Add a manual +Resolves: #1612779 + * Tue Feb 11 2020 Debarshi Ray - 3.28.1-3 - Disable Python 2 during the build - itstool doesn't need it anymore Resolves: #1597806