- Avoid conflict with EL 5.3 rpm (#466939, Panu Matilainen).

- Treat yasm and *-static as devel packages in rmdevelrpms.

.cvsignore

@@ -1,2 +1,2 @@
-rpmdevtools-5.0.tar.bz2
-spectool-1.0.7.tar.bz2
+rpmdevtools-5.3.tar.bz2
+spectool-1.0.8.tar.bz2

branch

@@ -0,0 +1 @@
+EL-5

rpmdevtools-5.3-el53-conflict.patch

@@ -0,0 +1,12 @@
+diff -up rpmdevtools-5.3/check-rpaths-worker~ rpmdevtools-5.3/check-rpaths-worker
+--- rpmdevtools-5.3/check-rpaths-worker~	2006-08-16 01:28:09.000000000 +0300
++++ rpmdevtools-5.3/check-rpaths-worker	2009-01-01 20:23:06.000000000 +0200
+@@ -63,8 +63,6 @@ function showHint()
+ * - to check existing files, set \$RPM_BUILD_ROOT and execute check-rpaths like
+ *   \$ RPM_BUILD_ROOT=<top-dir> /usr/lib/rpm/check-rpaths
+ *  
+-* 'check-rpaths' is part of 'rpmdevtools'.
+-*
+ *******************************************************************************
+ EOF
+ }

rpmdevtools.spec

@@ -1,10 +1,10 @@
 %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.8
 
 Name:           rpmdevtools
-Version:        5.0
-Release:        1%{?dist}
+Version:        5.3
+Release:        2%{?dist}
 Summary:        RPM Development Tools
 
 Group:          Development/Tools
@@ -12,6 +12,8 @@ License:        GPL
 URL:            http://fedora.redhat.com/
 Source0:        %{name}-%{version}.tar.bz2
 Source1:        http://people.redhat.com/nphilipp/spectool/spectool-%{spectool_version}.tar.bz2
+# Avoid conflict with EL 5.3 rpm, #466939
+Patch0:         %{name}-5.3-el53-conflict.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -42,6 +44,7 @@ rpmdev-extract      Extract various archives, "tar xvf" style
 
 %prep
 %setup -q -a 1
+%patch0 -p1
 cp -p spectool*/README README.spectool
 
 
@@ -84,6 +87,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} || :
@@ -111,6 +123,23 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Jan  1 2009 Ville Skyttä <ville.skytta at iki.fi> - 5.3-2
+- Avoid conflict with EL 5.3 rpm (#466939, Panu Matilainen).
+
+* 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
+4d2cd5398dfe75f2bfd96e9ecd9b46c1  rpmdevtools-5.3.tar.bz2
+42534ac977cd85df810a4450152543ec  spectool-1.0.8.tar.bz2