Update to 8.5

- Mark COPYING as %license where applicable

.gitignore

@@ -1 +1 @@
-/rpmdevtools-8.1.tar.xz
+/*.tar.*

rpmdevtools.spec

@@ -1,27 +1,27 @@
 %global spectool_version 1.0.10
 
 Name:           rpmdevtools
-Version:        8.1
+Version:        8.5
 Release:        1%{?dist}
 Summary:        RPM Development Tools
 
-Group:          Development/Tools
 # rpmdev-setuptree is GPLv2, everything else GPLv2+
 License:        GPLv2+ and GPLv2
 URL:            https://fedorahosted.org/rpmdevtools/
 Source0:        https://fedorahosted.org/released/rpmdevtools/%{name}-%{version}.tar.xz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 # help2man, pod2man, *python for creating man pages
 BuildRequires:  help2man
 BuildRequires:  %{_bindir}/pod2man
-BuildRequires:  python >= 2.4
+BuildRequires:  python >= 2.6
 BuildRequires:  rpm-python
 # emacs-common >= 1:22.3-3 for macros.emacs
 BuildRequires:  emacs-common >= 1:22.3-3
+%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
@@ -30,17 +30,14 @@ Requires:       file
 Requires:       findutils
 Requires:       gawk
 Requires:       grep
-Requires:       %{_bindir}/man
 Requires:       python >= 2.4
 Requires:       rpm-build >= 4.4.2.3
 Requires:       rpm-python
 Requires:       sed
-%if 0%{?fedora} > 14
 Requires:       emacs-filesystem
+%if 0%{?fedora}
 Requires:       xemacs-filesystem
 %endif
-# For _get_cword in bash completion snippet
-Conflicts:      bash-completion < 20080705
 
 %description
 This package contains scripts and (X)Emacs support files to aid in
@@ -74,54 +71,73 @@ rm -rf $RPM_BUILD_ROOT
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
+%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
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
-%if 0%{?fedora} <= 14
-%triggerin -- emacs-common
-[ -d %{_emacs_sitestartdir} ] && \
-  ln -sf %{_datadir}/rpmdevtools/rpmdev-init.el %{_emacs_sitestartdir} || :
-
-%triggerun -- emacs-common
-[ $2 -eq 0 ] && rm -f %{_emacs_sitestartdir}/rpmdev-init.el* || :
-
-%triggerin -- xemacs-common
-[ -d %{_xemacs_sitestartdir} ] && \
-  ln -sf %{_datadir}/rpmdevtools/rpmdev-init.el %{_xemacs_sitestartdir} || :
-
-%triggerun -- xemacs-common
-[ $2 -eq 0 ] && rm -f %{_xemacs_sitestartdir}/rpmdev-init.el* || :
-%endif
-
-
 %files
-%defattr(-,root,root,-)
-%doc COPYING NEWS
+%{!?_licensedir:%global license %%doc}
+%license COPYING
+%doc NEWS
 %config(noreplace) %{_sysconfdir}/rpmdevtools/
 %{_sysconfdir}/bash_completion.d/
 %{_datadir}/rpmdevtools/
 %{_bindir}/*
-%if 0%{?fedora} > 14
 %{_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
-%else
-%ghost %{_datadir}/emacs
-%ghost %{_datadir}/xemacs
 %endif
 %{_mandir}/man[18]/*.[18]*
 
 
 %changelog
+* 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.
+
+* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 8.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 8.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Sat Nov 12 2011 Ville Skyttä <ville.skytta@iki.fi> - 8.2-1
+- Update to 8.2.
+
 * Tue Apr 26 2011 Ville Skyttä <ville.skytta@iki.fi> - 8.1-1
 - Update to 8.1.
 

sources

@@ -1 +1 @@
-71541d89592f485770a85f64632eda35  rpmdevtools-8.1.tar.xz
+fd2f323c0ede762682985ed746880dd5  rpmdevtools-8.5.tar.xz