[emacs-bbdb] Remove the obsolete %clean section and %defattr declaration. Change some remaining references to th

[Göran Uddeborg]

commit 1f3351af4ffc63e3a224cdfa5acd8e71c6a9f74b
Author: Göran Uddeborg <goeran at uddeborg.se>
Date:   Thu Jul 5 13:48:22 2012 +0200

    Remove the obsolete %clean section and %defattr declaration.  Change
    some remaining references to the -el subpackage in the initial comment
    in the spec file.  Obsolete the -el subpackage if its release is
    strictly less than 7 rather than less or equal to 6.  Otherwise we
    miss release 6 packages with a release tag.

 emacs-bbdb.spec |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/emacs-bbdb.spec b/emacs-bbdb.spec
index 8aa11ef..8b2dac7 100644
--- a/emacs-bbdb.spec
+++ b/emacs-bbdb.spec
@@ -3,7 +3,7 @@
 # support for BBDB is required in VM, then the BBDB source elisp must be present
 # at build time. Hence there is a circular BuildRequires and bootstrapping is
 # required. The way to do this is (i) build emacs-vm without BuildRequires:
-# emacs-bbdb-el (ii) build emacs-bbdb with BuildRequires: emacs-vm-el (iii)
+# emacs-bbdb (ii) build emacs-bbdb with BuildRequires: emacs-vm (iii)
 # rebuild emacs-vm with BuildRequires: emacs-bbdb-el. Or vice versa.
 %define vmsupport 1
 
@@ -38,7 +38,7 @@ BuildRequires:  emacs-vm
 %endif
 
 # This obsolete and provides can be removed in Fedora 20
-Obsoletes:	%{name}-el <= 1:2.35-6
+Obsoletes:	%{name}-el < 1:2.35-7
 Provides:	%{name}-el <= 1:2.35-6
 
 %description 
@@ -106,9 +106,6 @@ rm -f utils/Makefile*
 find -name '*.pl' -exec chmod -x {} \;
 find -name '*.pl' -exec sed -i -e 's|#![a-z/]*|/usr/bin/perl|g' {} \;
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post
 /sbin/install-info %{_infodir}/bbdb.info %{_infodir}/dir 2>/dev/null || :
 
@@ -118,7 +115,6 @@ if [ $1 -eq 0 ]; then
 fi
 
 %files
-%defattr(-,root,root,-)
 %doc bits misc utils ChangeLog 
 %doc %{_infodir}/bbdb.info.gz
 %{lispdir}/
@@ -127,6 +123,13 @@ fi
 
 
 %changelog
+* Thu Jul  5 2012 Göran Uddeborg <goeran at uddeborg.se> 1:2.35-9
+- Remove obsolete "clean" and "defattr".
+- Update references to the removed -el packages in comments.
+- Obsolete -el subpackages strictly less than release 7 rather than
+  less than or equal to release 6.  Otherwise release 6 packages with
+  a dist tag will be considered newer. (BZ #832822)
+
 * Tue Jun  5 2012 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 1:2.35-8
 - Change BuildRequires for emacs-vm-el to emacs-vm