From cefe2b502396c09b050a0ecc1b8d62f724c633cc Mon Sep 17 00:00:00 2001
From: Daniel Steiner <daniel.steiner@dsteiner.ch>
Date: Fri, 18 Mar 2022 09:22:14 +0100
Subject: [PATCH] mydumper and gitea updated

---
 centos/SPECS/mydumper.spec | 17 +++++++++++------
 fedora/SPECS/gitea.spec    |  5 ++++-
 fedora/SPECS/mydumper.spec | 12 ++++++++----
 3 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/centos/SPECS/mydumper.spec b/centos/SPECS/mydumper.spec
index f0c3999..2754ccd 100644
--- a/centos/SPECS/mydumper.spec
+++ b/centos/SPECS/mydumper.spec
@@ -2,7 +2,7 @@
 %define _mysql  0
 Name:           mydumper
 Summary:        mydumper and myloader MySQL backup tools
-Version:        0.10.7
+Version:        0.12.1
 Release:	      1%{?dist}
 Group:          Applications/Databases
 License:        GPL
@@ -12,9 +12,10 @@ Source:         mydumper-%{version}.tar.gz
 BuildArch:      x86_64
 AutoReq:        no
 %if 0%{?_mysql}
-BuildRequires:  percona-server-devel
+BuildRequires:  community-mysql-devel
 %else
-BuildRequires:  mariadb-devel
+BuildRequires:  percona-server-devel
+#BuildRequires:  mariadb-devel
 %endif
 BuildRequires:  pkgconf-pkg-config
 BuildRequires:  pcre-devel
@@ -23,6 +24,7 @@ BuildRequires:  zlib-devel
 BuildRequires:  pcre-devel
 BuildRequires:  openssl-devel
 BuildRequires:  cmake
+BuildRequires:  python3-sphinx
 BuildRequires:  gcc-c++
 BuildRequires:  git
 
@@ -50,9 +52,7 @@ myloader is a tool used for multi-threaded restoration of mydumper backups.
 %__make
 
 %install
-install -m 0755 -d ${RPM_BUILD_ROOT}%{_bindir}
-install -m 0555 mydumper ${RPM_BUILD_ROOT}%{_bindir}
-install -m 0555 myloader ${RPM_BUILD_ROOT}%{_bindir}
+%__make install DESTDIR=${RPM_BUILD_ROOT}
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -60,8 +60,13 @@ rm -rf ${RPM_BUILD_ROOT}
 %files
 %defattr(-,root,root,-)
 %{_bindir}/*
+%{_datarootdir}/doc/%{name}/*
+%{_mandir}/man1/*
 
 %changelog
+* Fri Mar 18 2022 Daniel Steiner <daniel.steiner@daniel-steiner.org>
+- First build on Fedora 35.
+
 * Sun Jul 4 2021 Daniel Steiner <daniel.steiner@daniel-steiner.org>
 - First build on Fedora 33.
 
diff --git a/fedora/SPECS/gitea.spec b/fedora/SPECS/gitea.spec
index f36ba1d..b16923e 100644
--- a/fedora/SPECS/gitea.spec
+++ b/fedora/SPECS/gitea.spec
@@ -1,5 +1,5 @@
 Name:           gitea
-Version:        1.16.2
+Version:        1.16.4
 Release:        1%{?dist}
 Summary:        Gitea is a painless self-hosted Git service.
 %define	MyVersion %version
@@ -82,6 +82,9 @@ getent passwd gitea > /dev/null || \
 
 
 %changelog
+* Fri Mar 18 2022 Daniel Steiner <daniel.steiner@dsteiner.ch>
+- Update to 1.16.4.
+
 * Fri Feb 25 2022 Daniel Steiner <daniel.steiner@dsteiner.ch>
 - Update to 1.16.2.
 
diff --git a/fedora/SPECS/mydumper.spec b/fedora/SPECS/mydumper.spec
index 1f9ff68..4c9e688 100644
--- a/fedora/SPECS/mydumper.spec
+++ b/fedora/SPECS/mydumper.spec
@@ -2,7 +2,7 @@
 %define _mysql  0
 Name:           mydumper
 Summary:        mydumper and myloader MySQL backup tools
-Version:        0.10.7
+Version:        0.12.1
 Release:	      1%{?dist}
 Group:          Applications/Databases
 License:        GPL
@@ -23,6 +23,7 @@ BuildRequires:  zlib-devel
 BuildRequires:  pcre-devel
 BuildRequires:  openssl-devel
 BuildRequires:  cmake
+BuildRequires:  python3-sphinx
 BuildRequires:  gcc-c++
 BuildRequires:  git
 
@@ -50,9 +51,7 @@ myloader is a tool used for multi-threaded restoration of mydumper backups.
 %__make
 
 %install
-install -m 0755 -d ${RPM_BUILD_ROOT}%{_bindir}
-install -m 0555 mydumper ${RPM_BUILD_ROOT}%{_bindir}
-install -m 0555 myloader ${RPM_BUILD_ROOT}%{_bindir}
+%__make install DESTDIR=${RPM_BUILD_ROOT}
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -60,8 +59,13 @@ rm -rf ${RPM_BUILD_ROOT}
 %files
 %defattr(-,root,root,-)
 %{_bindir}/*
+%{_datarootdir}/doc/%{name}/*
+%{_mandir}/man1/*
 
 %changelog
+* Fri Mar 18 2022 Daniel Steiner <daniel.steiner@daniel-steiner.org>
+- First build on Fedora 35.
+
 * Sun Jul 4 2021 Daniel Steiner <daniel.steiner@daniel-steiner.org>
 - First build on Fedora 33.