Updates for CentOS 8

centos/SPECS/fdupes.spec

@@ -0,0 +1,87 @@
+# Place rpm-macros into proper location.
+%global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; /bin/echo $d)
+
+Name:		fdupes
+Epoch:		1
+Version:	1.6.1
+Release:	1%{?dist}
+Summary:	Finds duplicate files in a given set of directories
+
+License:	MIT
+URL:		https://github.com/adrianlopezroche/%{name}
+Source0:	%{url}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Source1:	macros.%{name}
+
+# From upstream.
+Patch0:		%{url}/commit/315f6702f1cc37036d9f826314245b44a781c387.patch#/%{name}-1.6.1-delete_old_TODO.patch
+Patch1:		%{url}/commit/e95ec42dc178eff0410880c3dc4c0dac3df442df.patch#/%{name}-1.6.1-option_sort_by_ctime.patch
+Patch2:		%{url}/commit/88f3d2dd31fbef7e539b2523724221e8e8e5a9f0.patch#/%{name}-1.6.1-allow_a_instead_of_all.patch
+
+%description
+FDUPES is a program for identifying duplicate files residing within specified
+directories.
+
+
+%prep
+%autosetup -p 1
+
+# From README.
+%{__cat} << EOF > LICENSE
+FDUPES Copyright (c) 1999 Adrian Lopez
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation files
+(the "Software"), to deal in the Software without restriction,
+including without limitation the rights to use, copy, modify, merge,
+publish, distribute, sublicense, and/or sell copies of the Software,
+and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+EOF
+
+
+%build
+%make_build					\
+	COMPILER_OPTIONS="%{?optflags}"		\
+	LDFLAGS="%{?__global_ldflags}"
+
+
+%install
+%make_install					\
+	INSTALL="%{__install} -p"		\
+	BIN_DIR=%{_bindir}			\
+	MAN_BASE_DIR=%{_mandir}
+
+%{__install} -Dpm 0644 %{SOURCE1}		\
+	%{buildroot}%{macrosdir}/macros.%{name}
+
+
+%check
+./%{name} testdir
+./%{name} --omitfirst testdir
+./%{name} --recurse testdir
+./%{name} --size testdir
+
+
+%files
+%license CONTRIBUTORS LICENSE
+%doc CHANGES README
+%doc %{_mandir}/man1/%{name}.1*
+%{_bindir}/%{name}
+%{macrosdir}/macros.fdupes
+
+
+%changelog
+* Sun Sep 29 2019 Daniel Steiner <daniel.steiner@daniel-steiner.org>
+- First build for CentOS 8.
+

centos/SPECS/git.spec

@@ -34,7 +34,7 @@
 %endif
 
 # Build gnome-keyring git-credential helper on Fedora and RHEL >= 7
-%if 0%{?fedora} || 0%{?rhel} >= 7
+%if 0%{?fedora} || 0%{?rhel} == 7
 %global gnome_keyring 1
 %else
 %global gnome_keyring 0
@@ -47,7 +47,7 @@
 %endif
 
 Name:           git
-Version:        2.21.0
+Version:        2.23.0
 Release:        1%{?dist}
 Summary:        Fast Version Control System
 License:        GPLv2
@@ -78,7 +78,12 @@ BuildRequires:  expat-devel
 BuildRequires:  gettext
 BuildRequires:  %{libcurl_devel}
 %if %{gnome_keyring}
+%if 0%{?fedora} || 0%{?rhel} <= 7
 BuildRequires:  libgnome-keyring-devel
+%else
+BuildRequires:  gnome-keyring
+BuildRequires:  gtk3-devel
+%endif
 %endif
 BuildRequires:  pcre2-devel
 BuildRequires:  openssl-devel
@@ -88,6 +93,7 @@ BuildRequires:  zlib-devel >= 1.2
 BuildRequires:  systemd
 %endif
 
+BuildRequires:  platform-python-devel
 Requires:       less
 Requires:       openssh-clients
 Requires:       perl(Error)
@@ -190,7 +196,11 @@ Group:          Development/Tools
 %if %{noarch_sub}
 BuildArch:      noarch
 %endif
+%if 0%{?rhel} >= 8
+BuildRequires:  python36
+%else
 BuildRequires:  python
+%endif
 Requires:       git = %{version}-%{release}
 %description p4
 %{summary}.
@@ -277,6 +287,18 @@ Perl interface to Git.
 %setup -q
 %patch1 -p1
 
+# Fix pyton path for python 3.6:
+for f in \
+contrib/hooks/multimail/git_multimail.py \
+contrib/hooks/multimail/migrate-mailhook-config \
+contrib/hooks/multimail/post-receive.example \
+contrib/hg-to-git/hg-to-git.py \
+contrib/fast-import/import-zips.py \
+Documentation/RelNotes/1.7.0.5.txt \
+git-instaweb.sh git-p4.py; do 
+	pathfix.py -pni /usr/bin/python3 $f 
+done
+
 %if %{use_prebuilt_docs}
 mkdir -p prebuilt_docs/{html,man}
 tar xf %{SOURCE10} -C prebuilt_docs/man
@@ -431,9 +453,10 @@ install -pm 644 contrib/completion/git-completion.tcsh \
 
 # Move contrib/hooks out of %%docdir and make them executable
 mkdir -p %{buildroot}%{_datadir}/git-core/contrib
-mv contrib/hooks %{buildroot}%{_datadir}/git-core/contrib
+cp -a contrib/hooks %{buildroot}%{_datadir}/git-core/contrib
 chmod +x %{buildroot}%{_datadir}/git-core/contrib/hooks/*
 pushd contrib > /dev/null
+rm -rf hooks
 ln -s ../../../git-core/contrib/hooks
 popd > /dev/null
 
@@ -482,6 +505,7 @@ rm -rf %{buildroot}
 %{!?_without_docs: %doc Documentation/*.html Documentation/docbook-xsl.css}
 %{!?_without_docs: %doc Documentation/howto Documentation/technical}
 %{_sysconfdir}/bash_completion.d
+%{_pkgdocdir}-%{version}/*
 
 %files bzr
 %defattr(-,root,root)

centos/SPECS/gitea.spec

@@ -12,10 +12,14 @@ Source0:        %name-%MyVersion.tar.gz
 Source1:	      gitea.service
 
 BuildRequires:	golang >= 1.8
+%if 0%{?rhel} >= 8
+%else
 BuildRequires:	go-bindata
+%endif
 BuildRequires:	make
 
 Requires: git
+BuildRequires: /usr/bin/pathfix.py
 
 # Temporary solution while waiting for golang and go-bindata to be built in cbs.centos.org
 ExclusiveArch: i686 x86_64
@@ -26,6 +30,13 @@ Gitea is a painless self-hosted Git service, built in GO
 %prep
 %setup -q -n %name-%MyVersion
 
+for f in \
+vendor/github.com/urfave/cli/runtests \
+vendor/github.com/urfave/cli/generate-flag-types \
+vendor/github.com/prometheus/procfs/ttar; do
+	pathfix.py -pni /usr/bin/python3 $f
+done
+
 %build
 cd ../
 mkdir src/code.gitea.io -p

centos/SPECS/perl-Monitoring-Plugin.spec

@@ -17,15 +17,14 @@ Url:            http://search.cpan.org/dist/Monitoring-Plugin/
 Provides:       %cpan_name = %{version}-%{release}
 Provides:       Nagios-Plugin
 Obsoletes:      perl-Nagios-Plugin
-%perl_requires 
 Requires:       perl-Class-Accessor 
 Requires:       perl-Config-Tiny 
 Requires:       perl-Math-Calc-Units 
 Requires:       perl-Params-Validate
 BuildRequires:  perl
+BuildRequires:  perl-Module-Install
 BuildRequires:  perl-Class-Accessor
 BuildRequires:  perl-Config-Tiny
-BuildRequires:  perl-Math-Calc-Units
 BuildRequires:  perl-Params-Validate
 BuildRequires:  perl-ExtUtils-MakeMaker
 BuildRequires:  perl-macros

centos/SPECS/powerline.spec

@@ -1,23 +1,23 @@
 %global debug_package %{nil}
 
 Name:           powerline
-Version:        2.6
+Version:        2.7
-Release:        2%{?dist}
+Release:        1%{?dist}
 
 Summary:        The ultimate status-line/prompt utility
 License:        MIT
 Url:            https://github.com/powerline/powerline
 
-BuildRequires:  python34-setuptools
+BuildRequires:  python3-setuptools
-BuildRequires:  python-sphinx
+BuildRequires:  python3-sphinx
-BuildRequires:  python34-devel
+BuildRequires:  python36-devel
 BuildRequires:  fdupes
 BuildRequires:  fontconfig
 BuildRequires:  systemd
 BuildRequires:  tmux
 BuildRequires:  vim-minimal
 
-Requires:       python34
+Requires:       python36
 Requires:       powerline-fonts
 Requires(post): systemd
 Requires(preun): systemd
@@ -27,7 +27,7 @@ Source0:        https://github.com/powerline/powerline/archive/%{version}/powerl
 Source1:        vim-powerline.metainfo.xml
 
 Patch0:         powerline-py2v3-fix.patch
-Patch1:         powerline-2.6-gcc7_fixes.patch
+#Patch1:         powerline-2.6-gcc7_fixes.patch
 Patch2:         sphinx-build.patch
 
 %description
@@ -80,9 +80,32 @@ to your ~/.tmux.conf file.
 %prep
 %setup -q
 %patch0 -p1 -b .py2v3-fix
-%patch1 -p1 -b .gcc7-fixes
 %patch2 -p0 -b .sphinx-build
 
+for f in \
+client/powerline.py \
+CONTRIBUTING.rst \
+powerline/bindings/i3/powerline-i3.py \
+powerline/bindings/pdb/__main__.py \
+powerline/bindings/awesome/powerline-awesome.py \
+powerline/bindings/lemonbar/powerline-lemonbar.py \
+powerline/bindings/bar/powerline-bar.py \
+scripts/powerline-config \
+scripts/powerline-release.py \
+scripts/powerline-daemon \
+scripts/powerline-lint \
+scripts/powerline-render \
+setup.py \
+tests/test_in_vterm/test_vim.py \
+tests/test_in_vterm/test_tmux.py \
+tests/test_shells/run_script.py \
+tests/test_shells/postproc.py \
+tools/generate_gradients.py \
+tools/purge-PRs.py \
+tools/colors_find.py; do
+	pathfix.py -pni /usr/bin/python3 $f
+done
+
 %build
 # nothing to build
 

centos/SPECS/pydf.spec

@@ -6,7 +6,12 @@ License:        Public Domain
 Group:          Applications/System
 Source:         https://pypi.python.org/packages/source/p/pydf/%{name}-%{version}.tar.gz
 URL:            https://pypi.python.org/pypi/pydf
-Requires:       python >= 2.3
+%if 0%{?rhel} >= 8
+Requires:       python36
+%else
+Requires:       python
+%endif
+BuildRequires:  platform-python-devel
 BuildArch:      noarch
 
 %description
@@ -15,6 +20,8 @@ just like df, but in colors. The output format is completely customizable.
 
 %prep
 %setup -q
+pathfix.py -pni /usr/bin/python3 pydf
+pathfix.py -pni /usr/bin/python3 pydfrc
 
 %build
 

centos/SPECS/tmux.spec

@@ -2,7 +2,7 @@
 
 Name:           tmux
 Version:        3.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A terminal multiplexer
 
 # Most of the source is ISC licensed; some of the files in compat/ are 2 and
@@ -12,6 +12,7 @@ URL:            https://tmux.github.io/
 Source0:        https://github.com/tmux/%{name}/releases/download/%{version}/%{name}-%{version}.tar.gz
 # Examples has been removed - so include the bash_completion here
 Source1:        bash_completion_tmux.sh
+Source2:        tmux.conf
 
 BuildRequires:  gcc
 BuildRequires:  pkgconfig(libevent)
@@ -39,6 +40,7 @@ as GNU Screen.
 %make_install
 # bash completion
 install -Dpm 644 %{SOURCE1} %{buildroot}%{_datadir}/bash-completion/completions/tmux
+install -Dpm 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/tmux.conf
 
 %post
 if [ "$1" = 1 ]; then
@@ -64,9 +66,12 @@ fi
 %{_bindir}/tmux
 %{_mandir}/man1/tmux.1.*
 %{_datadir}/bash-completion/completions/tmux
+%config(noreplace) %{_sysconfdir}/tmux.conf
 
 %changelog
+* Sun Sep 29 2019 Daniel Steiner <daniel.steiner@daniel-steiner.org>
+- Default tmux config added.
+
 * Fri Aug 16 2019 Daniel Steiner <daniel.steiner@daniel-steiner.org>
 - Initial to version 3.0 for CentOS.
 
-