- Fix Epoch handling in the 2-arg form of rpmdev-vercmp with yum < 3.1.2.

- The long form of the list option in rmdevelrpms is --list-only, not
    --list.
Thu Jul 5 2007 Ville Skyttä <ville.skytta at iki.fi>
- Add cmake and scons to default devel package list in rpmdev-rmdevelrpms.
- Add LSB comment block to init script template.
Wed Jun 27 2007 Ville Skyttä <ville.skytta at iki.fi>
- Add 2-argument form for comparing EVR strings to rpmdev-vercmp (available
    only if rpmUtils.miscutils is available).
Sat Jun 16 2007 Ville Skyttä <ville.skytta at iki.fi>
- Include rpmls (#213778).
Fri Jun 15 2007 Ville Skyttä <ville.skytta at iki.fi>
- Update spectool to 1.0.9 (#243731).
Wed Apr 11 2007 Ville Skyttä <ville.skytta at iki.fi>
- Add --list-only option to rmdevelrpms (Thorsten Leemhuis).
Tue Mar 13 2007 Ville Skyttä <ville.skytta at iki.fi>
- BR perl(ExtUtils::MakeMaker) by default in perl spec template.
- Update URL.
Wed Nov 8 2006 Ville Skyttä <ville.skytta at iki.fi>
- Arch-qualify output of matched packages in rmdevelrpms and allow
    arch-qualified packages in the config file.

.cvsignore

@@ -1,2 +1,2 @@
-rpmdevtools-5.0.tar.bz2
-spectool-1.0.7.tar.bz2
+rpmdevtools-5.4.tar.bz2
+spectool-1.0.9.tar.bz2

branch

@@ -0,0 +1 @@
+F-7

rpmdevtools.spec

@@ -1,15 +1,15 @@
 %define emacs_sitestart_d  %{_datadir}/emacs/site-lisp/site-start.d
 %define xemacs_sitestart_d %{_datadir}/xemacs/site-packages/lisp/site-start.d
-%define spectool_version   1.0.7
+%define spectool_version   1.0.9
 
 Name:           rpmdevtools
-Version:        5.0
+Version:        5.4
 Release:        1%{?dist}
 Summary:        RPM Development Tools
 
 Group:          Development/Tools
 License:        GPL
-URL:            http://fedora.redhat.com/
+URL:            http://fedoraproject.org/
 Source0:        %{name}-%{version}.tar.bz2
 Source1:        http://people.redhat.com/nphilipp/spectool/spectool-%{spectool_version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -19,10 +19,25 @@ Provides:       spectool = %{spectool_version}
 Provides:       fedora-rpmdevtools = %{version}
 Obsoletes:      fedora-rpmdevtools < 5.0
 # Required for tool operations
-Requires:       rpm-python, python, cpio, sed, perl, wget, file
+Requires:       rpm-python
+Requires:       python
+Requires:       cpio
+Requires:       sed
+Requires:       perl
+Requires:       wget
+Requires:       file
 # Minimal RPM build requirements
-Requires:       rpm-build, gcc, gcc-c++, redhat-rpm-config, make, tar, patch
-Requires:       diffutils, gzip, bzip2, unzip
+Requires:       rpm-build
+Requires:       gcc
+Requires:       gcc-c++
+Requires:       redhat-rpm-config
+Requires:       make
+Requires:       tar
+Requires:       patch
+Requires:       diffutils
+Requires:       gzip
+Requires:       bzip2
+Requires:       unzip
 
 %description
 This package contains scripts and (X)Emacs support files to aid in
@@ -84,6 +99,15 @@ make check
 rm -rf $RPM_BUILD_ROOT
 
 
+%post
+# Upgrade from fedora-rpmdevtools:
+oldconf=%{_sysconfdir}/fedora/rmdevelrpms.conf
+if [ $1 -eq 1 -a -f $oldconf ] ; then
+  echo "5615a64d80f6e6b4df77b3ab0ef1469c  $oldconf" \
+  | md5sum -c --status - >/dev/null 2>&1 || \
+  cat $oldconf > %{_sysconfdir}/rpmdevtools/rmdevelrpms.conf || :
+fi
+
 %triggerin -- emacs-common
 [ -d %{emacs_sitestart_d} ] && \
   ln -sf %{_datadir}/rpmdevtools/rpmdev-init.el %{emacs_sitestart_d} || :
@@ -107,10 +131,53 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/*
 %{_prefix}/lib/rpm/check-*
 %ghost %{_datadir}/*emacs
-%{_mandir}/man?/*.*
+%{_mandir}/man[18]/rpm*.[18]*
 
 
 %changelog
+* Sat Jul  7 2007 Ville Skyttä <ville.skytta at iki.fi> - 5.4-1
+- Fix Epoch handling in the 2-arg form of rpmdev-vercmp with yum < 3.1.2.
+- The long form of the list option in rmdevelrpms is --list-only, not --list.
+
+* Thu Jul  5 2007 Ville Skyttä <ville.skytta at iki.fi>
+- Add cmake and scons to default devel package list in rpmdev-rmdevelrpms.
+- Add LSB comment block to init script template.
+
+* Wed Jun 27 2007 Ville Skyttä <ville.skytta at iki.fi>
+- Add 2-argument form for comparing EVR strings to rpmdev-vercmp
+  (available only if rpmUtils.miscutils is available).
+
+* Sat Jun 16 2007 Ville Skyttä <ville.skytta at iki.fi>
+- Include rpmls (#213778).
+
+* Fri Jun 15 2007 Ville Skyttä <ville.skytta at iki.fi>
+- Update spectool to 1.0.9 (#243731).
+
+* Wed Apr 11 2007 Ville Skyttä <ville.skytta at iki.fi>
+- Add --list-only option to rmdevelrpms (Thorsten Leemhuis).
+
+* Tue Mar 13 2007 Ville Skyttä <ville.skytta at iki.fi>
+- BR perl(ExtUtils::MakeMaker) by default in perl spec template.
+- Update URL.
+
+* Wed Nov  8 2006 Ville Skyttä <ville.skytta at iki.fi>
+- Arch-qualify output of matched packages in rmdevelrpms and allow
+  arch-qualified packages in the config file.
+
+* Wed Oct 25 2006 Ville Skyttä <ville.skytta at iki.fi> - 5.3-1
+- Update spectool to 1.0.8, fixes #212108.
+
+* Mon Oct  2 2006 Ville Skyttä <ville.skytta at iki.fi> - 5.2-1
+- Skip *.jar.so.debug in check-buildroot (#208903).
+- Treat yasm and *-static as devel packages in rmdevelrpms.
+
+* Sat Sep  9 2006 Ville Skyttä <ville.skytta at iki.fi> - 5.1-1
+- Re-add PHP PEAR spec template, more improvements to it (#198706,
+  Christopher Stone, Remi Collet).
+
+* Tue Aug 22 2006 Ville Skyttä <ville.skytta at iki.fi> - 5.0-2
+- Migrate rmdevelrpms config when upgrading from fedora-rpmdevtools.
+
 * Sun Aug 20 2006 Ville Skyttä <ville.skytta at iki.fi> - 5.0-1
 - Re-rename almost everything to rpmdev-*, with backwards compat symlinks.
 - Don't encourage %%ghost'ing *.pyo in Python spec template, add some comments.

sources

@@ -1,2 +1,2 @@
-d50bf6967feb6a36de156fcd2888a962  rpmdevtools-5.0.tar.bz2
-e2b1668f39c085807cae5a770c252dd5  spectool-1.0.7.tar.bz2
+fe7e91079b7a317f531881ce0f205594  rpmdevtools-5.4.tar.bz2
+b3563111a44656efd3a2d9b44b830562  spectool-1.0.9.tar.bz2