Update to 8.9

- Specfile cleanups

rpmdevtools.spec

@@ -1,7 +1,13 @@
 %global spectool_version 1.0.10
 
+%if 0%{?fedora} > 22
+%bcond_without python3
+%else
+%bconf_with python3
+%endif
+
 Name:           rpmdevtools
-Version:        8.3
+Version:        8.9
 Release:        1%{?dist}
 Summary:        RPM Development Tools
 
@@ -14,12 +20,21 @@ BuildArch:      noarch
 # help2man, pod2man, *python for creating man pages
 BuildRequires:  help2man
 BuildRequires:  %{_bindir}/pod2man
-BuildRequires:  python >= 2.4
+BuildRequires:  perl-generators
+%if %{with python3}
+BuildRequires:  python3
+BuildRequires:  rpm-python3
+%else
+BuildRequires:  python >= 2.7
 BuildRequires:  rpm-python
+%endif
 # emacs-common >= 1:22.3-3 for macros.emacs
 BuildRequires:  emacs-common >= 1:22.3-3
+BuildRequires:  bash-completion
+%if 0%{?fedora}
 # xemacs-common >= 21.5.29-8 for macros.xemacs
 BuildRequires:  xemacs-common >= 21.5.29-8
+%endif
 Provides:       spectool = %{spectool_version}
 Requires:       curl
 Requires:       diffutils
@@ -28,13 +43,18 @@ Requires:       file
 Requires:       findutils
 Requires:       gawk
 Requires:       grep
-Requires:       %{_bindir}/man
-Requires:       python >= 2.4
 Requires:       rpm-build >= 4.4.2.3
+%if %{with python3}
+Requires:       rpm-python3
+%else
+Requires:       python >= 2.4
 Requires:       rpm-python
+%endif
 Requires:       sed
 Requires:       emacs-filesystem
+%if 0%{?fedora}
 Requires:       xemacs-filesystem
+%endif
 
 %description
 This package contains scripts and (X)Emacs support files to aid in
@@ -56,39 +76,100 @@ rpmdev-bumpspec     Bump revision in specfile
 
 %prep
 %setup -q
+%if %{with python3}
+grep -lF "%{_bindir}/python " * \
+| xargs sed -i -e "s|%{_bindir}/python |%{_bindir}/python3 |"
+%endif
 
 
 %build
 %configure --libdir=%{_prefix}/lib
-make %{?_smp_mflags}
+%make_build
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install DESTDIR=$RPM_BUILD_ROOT
+%make_install
 
+echo %%{_datadir}/bash-completion > %{name}.files
+[ -d $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d ] && \
+echo %%{_sysconfdir}/bash_completion.d > %{name}.files
+
+%if 0%{?fedora}
 for dir in %{_emacs_sitestartdir} %{_xemacs_sitestartdir} ; do
+%else
+for dir in %{_emacs_sitestartdir} ; do
+%endif
   install -dm 755 $RPM_BUILD_ROOT$dir
   ln -s %{_datadir}/rpmdevtools/rpmdev-init.el $RPM_BUILD_ROOT$dir
   touch $RPM_BUILD_ROOT$dir/rpmdev-init.elc
 done
 
 
-%files
+%files -f %{name}.files
-%doc COPYING NEWS
+%license COPYING
+%doc NEWS
 %config(noreplace) %{_sysconfdir}/rpmdevtools/
-%{_sysconfdir}/bash_completion.d/
 %{_datadir}/rpmdevtools/
 %{_bindir}/*
 %{_emacs_sitestartdir}/rpmdev-init.el
 %ghost %{_emacs_sitestartdir}/rpmdev-init.elc
+%if 0%{?fedora}
 %{_xemacs_sitestartdir}/rpmdev-init.el
 %ghost %{_xemacs_sitestartdir}/rpmdev-init.elc
+%endif
 %{_mandir}/man[18]/*.[18]*
 
 
 %changelog
+* Sat Jun 25 2016 Ville Skyttä <ville.skytta@iki.fi> - 8.9-1
+- Update to 8.9
+
+* Sat Jun 25 2016 Ville Skyttä <ville.skytta@iki.fi> - 8.8-1
+- Update to 8.8
+
+* Fri Jun 24 2016 Petr Písař <ppisar@redhat.com>
+- Add new mandatory perl build deps
+
+* Thu Jun 23 2016 Ville Skyttä <ville.skytta@iki.fi> - 8.7-1
+- Update to 8.7
+- Specfile cleanups
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 8.6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Fri Jun  5 2015 Ville Skyttä <ville.skytta@iki.fi> - 8.6-2
+- Use python3 on > F-22
+
+* Sun May 10 2015 Ville Skyttä <ville.skytta@iki.fi> - 8.6-1
+- Update to 8.6
+
+* Mon Oct 20 2014 Ville Skyttä <ville.skytta@iki.fi> - 8.5-1
+- Update to 8.5
+- Mark COPYING as %%license where applicable
+
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 8.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Thu Oct 17 2013 Ville Skyttä <ville.skytta@iki.fi> - 8.4-2
+- Do not require devscripts in any scenario.
+
+* Mon Oct  7 2013 Ville Skyttä <ville.skytta@iki.fi> - 8.4-1
+- Update to 8.4.
+
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 8.3-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Wed Jul 17 2013 Petr Pisar <ppisar@redhat.com> - 8.3-4
+- Perl 5.18 rebuild
+
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 8.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Tue Oct 16 2012 Thomas Woerner <twoerner@redhat.com> - 8.3-2
+- xemacs is not available on RHEL (RHBZ#866841)
+
 * Sun Sep  2 2012 Ville Skyttä <ville.skytta@iki.fi> - 8.3-1
 - Update to 8.3.
 - Drop specfile constructs no longer needed with Fedora's rpm.

sources

@@ -1 +1 @@
-d54e74f28acc4bf3922a558f522beb94  rpmdevtools-8.3.tar.xz
+35bab0c28f2af544af53ac1aed598ac0  rpmdevtools-8.9.tar.xz