- 6.7.

- Make rpmdev-diff, rpmdev-md5 and rpminfo honor TMPDIR.
Sat Apr 26 2008 Ville Skyttä <ville.skytta at iki.fi>
- Make rpmls work with URLs.
Sun Apr 20 2008 Ville Skyttä <ville.skytta at iki.fi>
- Include rpm arch in dir names created by rpmdev-extract (#443266).
Fri Apr 18 2008 Ville Skyttä <ville.skytta at iki.fi>
- Remove duplicate "reload" from case block in init script template.
- Fix exit status of "reload" in case service is not running in init script
    template (#442993).

.cvsignore

@@ -1,2 +1,2 @@
 spectool-1.0.10.tar.bz2
-rpmdevtools-6.8.tar.bz2
+rpmdevtools-6.7.tar.bz2

Makefile

@@ -0,0 +1,21 @@
+# Makefile for source rpm: rpmdevtools
+# $Id$
+NAME := rpmdevtools
+SPECFILE = $(firstword $(wildcard *.spec))
+
+define find-makefile-common
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+endef
+
+MAKEFILE_COMMON := $(shell $(find-makefile-common))
+
+ifeq ($(MAKEFILE_COMMON),)
+# attept a checkout
+define checkout-makefile-common
+test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
+endef
+
+MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
+endif
+
+include $(MAKEFILE_COMMON)

rpmdevtools.spec

@@ -1,9 +1,9 @@
-%global emacs_sitestart_d  %{_datadir}/emacs/site-lisp/site-start.d
+%define emacs_sitestart_d  %{_datadir}/emacs/site-lisp/site-start.d
-%global xemacs_sitestart_d %{_datadir}/xemacs/site-packages/lisp/site-start.d
+%define xemacs_sitestart_d %{_datadir}/xemacs/site-packages/lisp/site-start.d
-%global spectool_version   1.0.10
+%define spectool_version   1.0.10
 
 Name:           rpmdevtools
-Version:        6.8
+Version:        6.7
 Release:        1%{?dist}
 Summary:        RPM Development Tools
 
@@ -11,7 +11,7 @@ Group:          Development/Tools
 # rpmdev-setuptree is GPLv2, everything else GPLv2+
 License:        GPLv2+ and GPLv2
 URL:            https://fedorahosted.org/rpmdevtools/
-Source0:        https://fedorahosted.org/releases/r/p/rpmdevtools/%{name}-%{version}.tar.bz2
+Source0:        http://scop.fedorapeople.org/rpmdevtools/%{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)
 
@@ -22,7 +22,6 @@ BuildRequires:  %{_bindir}/pod2man
 BuildRequires:  python
 BuildRequires:  rpm-python
 Provides:       spectool = %{spectool_version}
-Provides:       fedora-rpmdevtools = %{version}
 Obsoletes:      fedora-rpmdevtools < 5.0
 # Minimal RPM build requirements
 Requires:       bash
@@ -38,6 +37,7 @@ Requires:       grep
 Requires:       gzip
 Requires:       info
 Requires:       make
+Requires:       patch
 Requires:       redhat-release
 Requires:       redhat-rpm-config
 Requires:       rpm-build >= 4.4.2.1
@@ -52,7 +52,7 @@ Requires:       fakeroot
 Requires:       file
 Requires:       perl
 Requires:       python
-Requires:       rpm-python >= 4.4.2.2
+Requires:       rpm-python
 #Requires:      sed
 Requires:       wget
 
@@ -65,7 +65,7 @@ rpmdev-newspec      Creates new .spec from template
 rpmdev-rmdevelrpms  Find (and optionally remove) "development" RPMs
 rpmdev-checksig     Check package signatures using alternate RPM keyring
 rpminfo             Print information about executables and libraries
-rpmdev-md5/sha*     Display checksums of all files in an RPM package file
+rpmdev-md5          Display the md5sum of all files in an RPM
 rpmdev-vercmp       RPM version comparison checker
 spectool            Expand and download sources and patches in specfiles
 rpmdev-wipetree     Erase all files within dirs created by rpmdev-setuptree
@@ -97,32 +97,11 @@ for dir in %{emacs_sitestart_d} %{xemacs_sitestart_d} ; do
   touch $RPM_BUILD_ROOT$dir/rpmdev-init.elc
 done
 
-# Backwards compatibility symlinks
-ln -s rpmdev-checksig    $RPM_BUILD_ROOT%{_bindir}/fedora-rpmchecksig
-ln -s rpmdev-diff        $RPM_BUILD_ROOT%{_bindir}/fedora-diffarchive
-ln -s rpmdev-extract     $RPM_BUILD_ROOT%{_bindir}/fedora-extract
-ln -s rpmdev-md5         $RPM_BUILD_ROOT%{_bindir}/fedora-md5
-ln -s rpmdev-newspec     $RPM_BUILD_ROOT%{_bindir}/fedora-newrpmspec
-ln -s rpmdev-rmdevelrpms $RPM_BUILD_ROOT%{_bindir}/fedora-rmdevelrpms
-ln -s rpmdev-setuptree   $RPM_BUILD_ROOT%{_bindir}/fedora-buildrpmtree
-ln -s rpmdev-vercmp      $RPM_BUILD_ROOT%{_bindir}/fedora-rpmvercmp
-ln -s rpmdev-wipetree    $RPM_BUILD_ROOT%{_bindir}/fedora-wipebuildtree
-ln -s rpminfo            $RPM_BUILD_ROOT%{_bindir}/fedora-rpminfo
-
 
 %clean
 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} || :
@@ -143,7 +122,6 @@ fi
 %doc COPYING README*
 %config(noreplace) %{_sysconfdir}/rpmdevtools/
 %{_datadir}/rpmdevtools/
-%{_bindir}/fedora-*
 %{_bindir}/rpm*
 %{_bindir}/spectool
 %ghost %{_datadir}/*emacs
@@ -151,44 +129,6 @@ fi
 
 
 %changelog
-* Fri Apr  3 2009 Ville Skyttä <ville.skytta at iki.fi> - 6.8-1
-- 6.8.
-
-* Sun Feb 22 2009 Ville Skyttä <ville.skytta at iki.fi>
-- Use %%global instead of %%define in spec templates.
-- Handle %%global in addition to %%define in rpmdev-bumpspec.
-
-* Mon Jan 26 2009 Ville Skyttä <ville.skytta at iki.fi>
-- Add result dependent exit statuses to rpmdev-vercmp.
-
-* Fri Dec 26 2008 Ville Skyttä <ville.skytta at iki.fi>
-- Add minimum version to rpm-python dependency (for rpmdev-bumpspec).
-- Add man page for rpmdev-newspec.
-
-* Tue Dec 16 2008 Ville Skyttä <ville.skytta at iki.fi>
-- Add imake and intltool to internal list of devel packages in rmdevelrpms.
-
-* Sat Dec 13 2008 Ville Skyttä <ville.skytta at iki.fi>
-- Add rpmdev-sha*/*sum companions to rpmdev-md5 (ticket #7).
-
-* Wed Nov 26 2008 Ville Skyttä <ville.skytta at iki.fi>
-- Add vamp-plugin-sdk to internal list of non-devel packages in rmdevelrpms
-  (#472641, Michael Schwendt).
-
-* Mon Oct 13 2008 Ville Skyttä <ville.skytta at iki.fi>
-- Show available types in rpmdev-newspec --help (ticket #6, Todd Zullinger).
-
-* Fri Sep 26 2008 Ville Skyttä <ville.skytta at iki.fi>
-- Add -r/--rightmost option to rpmdev-bumpspec (ticket #1, Thorsten Leemhuis).
-- Add %%packager from rpm config to the set of defaults for rpmdev-bumpspec's
-  user string.
-
-* Thu Sep 25 2008 Ville Skyttä <ville.skytta at iki.fi>
-- Bring rpmdev-bumpspec copyright holder closer to truth (Michael Schwendt).
-
-* Sun Sep  7 2008 Ville Skyttä <ville.skytta at iki.fi>
-- Improve arch specific %%files in perl spec template (#461177, Chris Weyl).
-
 * Sun Aug  3 2008 Ville Skyttä <ville.skytta at iki.fi> - 6.7-1
 - 6.7.
 - Make rpmdev-diff, rpmdev-md5 and rpminfo honor TMPDIR.
@@ -234,6 +174,7 @@ fi
 - Add ';;' to the init script template's reload action.
 
 * Sat Dec  8 2007 Ville Skyttä <ville.skytta at iki.fi>
+- Add fonts spec template from the Fedora Fonts SIG (#407781).
 - Add option to use macro style instead of shell style variables to newspec.
 - Prefer ~/.config/rpmdevtools/rmdevelrpms.conf over ~/.rmdevelrpmsrc in
   rmdevelrpms.
@@ -287,6 +228,7 @@ fi
 
 * Tue Mar 13 2007 Ville Skyttä <ville.skytta at iki.fi>
 - BR perl(ExtUtils::MakeMaker) by default in perl spec template.
+- Drop deprecated backwards compatibility with fedora-rpmdevtools.
 - Update URL.
 
 * Wed Nov  8 2006 Ville Skyttä <ville.skytta at iki.fi>

sources

@@ -1,2 +1,2 @@
 d193612122f297ee4b37f1b04f605768  spectool-1.0.10.tar.bz2
-32a879de3650642a75e58f61f3b07d8e  rpmdevtools-6.8.tar.bz2
+819ece90d6be10c4ed85cc4a6975589c  rpmdevtools-6.7.tar.bz2