gnucash-docs master: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash-docs/commit/621cd780 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/4fe013c5 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/31c13e6c (commit)
	from  https://github.com/Gnucash/gnucash-docs/commit/b341bb7e (commit)



commit 621cd7804bc7bc7fdd15b48e5d18e4d604770410
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun Jun 7 10:12:58 2020 -0700

    Release documentation for GnuCash 3.904.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1203f00..d831c47 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,7 @@ cmake_minimum_required (VERSION 3.5)
 # This sets a number of environment variables we can use later on
 # The names of these variables start with PROJECT_ and gnucash-docs_VERSION
 project (gnucash-docs
-    VERSION 3.903
+    VERSION 3.904
     LANGUAGES NONE)
 
 set (PACKAGE_NAME GnuCash Docs)
diff --git a/NEWS b/NEWS
index 557f397..498f36b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,7 @@
 Version History
 ---------------
+ 3.904  - 7 June 2020
+        No changes.
  3.903  - 1 June 2020
         o  L10N of "Improve links to Selinger's tutorials"
         o  Minor Correction to Help ManualCorrect reconciliation action on

commit 4fe013c5d03dd771bd7532863655f3135796c5dc
Merge: b341bb7 31c13e6
Author: John Ralls <jralls at ceridwen.us>
Date:   Sat Jun 6 18:26:59 2020 -0700

    Merge branch 'maint'


commit 31c13e6c5acbcbc7fea6e52f3d098ecfb810a396
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Mon Jun 1 06:55:38 2020 +0200

    Update gnucash-docs.spec.in
    
    It was unmaintained since many years.
    Merge the tested version from
    https://build.opensuse.org/package/view_file/home:felle:branches:GNOME:Apps/gnucash-docs/gnucash-docs.spec

diff --git a/gnucash-docs.spec.in b/gnucash-docs.spec.in
index 9ef11b5..20affc6 100644
--- a/gnucash-docs.spec.in
+++ b/gnucash-docs.spec.in
@@ -1,17 +1,18 @@
 %define version @VERSION@
-%define __libtoolize /bin/true
 
-Name:      	gnucash-docs
-Summary:   	This is the documentation module for GnuCash
-Version:   	%{version}
-Release:  	1
-License: 	GNU Free Documentation License
-Group:     	Applications/Finance
-URL:            http://www.gnucash.org
-Source:    	http://www.gnucash.org/pub/gnucash/sources/stable/gnucash-docs-%{version}.tar.gz
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-root
-Requires:  	gnucash >= 1.8.0, scrollkeeper >= 0.3.4
-BuildPrereq: 	docbook-style-xsl
+Name:           gnucash-docs
+Summary:        This is the documentation module for GnuCash
+Version:        %{version}
+Release:        0
+License:        GNU Free Documentation License
+Group:          Office/Finance
+URL:            https://www.gnucash.org
+Source:         https://sourceforge.net/projects/gnucash/files/gnucash%20(stable)/%{version}/gnucash-docs-%{version}.tar.gz
+BuildRequires:  fdupes
+BuildRequires:  sgml-skel
+BuildRequires:  xsltproc
+BuildArch:      noarch
+Recommends:     %{_bindir}/gnome-help
 
 %description
 GnuCash is a personal finance manager. A check-book like
@@ -21,31 +22,28 @@ designed to be simple and easy to use, but is backed with
 double-entry accounting principles to ensure balanced books.
 This is the documentation module for GnuCash.
 
-
 %prep
 %setup -q
 
 %build
-%configure --localstatedir=/var/lib
-
-make RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
+%configure
+make %{?_smp_mflags}
 
 %install
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
-
-LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir}:$RPM_BUILD_ROOT%{_libdir}/gnucash make DESTDIR=$RPM_BUILD_ROOT install
-
-%clean
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
-
-%post
-if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update -o %{_datadir}/omf/gnucash-docs; fi
-
-%postun
-if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update; fi
-
-%files
-%defattr(444,root,root,755)
-%{_datadir}/gnome/help/gnucash
-%{_datadir}/omf/gnucash-docs
-%doc AUTHORS COPYING-DOCS ChangeLog NEWS README HACKING
+%make_install
+%find_lang gnucash-guide %{?no_lang_C}
+%find_lang gnucash-help %{?no_lang_C}
+%fdupes %{buildroot}%{_datadir}
+
+%files -f gnucash-guide.lang -f gnucash-help.lang
+%license COPYING
+%doc AUTHORS COPYING-DOCS HACKING NEWS README
+# Own dirs so we do not have to depend on libgnome
+%dir %{_datadir}/gnome
+%dir %{_datadir}/gnome/help
+%dir %{_datadir}/gnome/help/gnucash-guide
+%doc %{_datadir}/gnome/help/gnucash-guide/C/
+%dir %{_datadir}/gnome/help/gnucash-help
+%doc %{_datadir}/gnome/help/gnucash-help/C/
+
+%changelog



Summary of changes:
 CMakeLists.txt       |  2 +-
 NEWS                 |  2 ++
 gnucash-docs.spec.in | 66 +++++++++++++++++++++++++---------------------------
 3 files changed, 35 insertions(+), 35 deletions(-)