[emacs-vm: 4/4] Remove some duplicates in the files section.

[Göran Uddeborg]

commit eb1fd5c3accb5d4999abd15bb6a20c7bd1d17ee7
Author: Göran Uddeborg <goeran at uddeborg.se>
Date:   Tue May 21 00:07:05 2013 +0200

    Remove some duplicates in the files section.
    
    - Remove clean section no longer needed.
    - Remove defattr declaration no longer needed.
    - Swedish translation of summary and description added.
    - Update comments to reflect that .el files are now included in the base
      package rather than the -el subpackage.
    - The Obsoletes/Provides declaration for the -el subpackage are no longer
      needed in F20.

 emacs-vm.spec |   39 +++++++++++++++++++++++++--------------
 1 files changed, 25 insertions(+), 14 deletions(-)
---
diff --git a/emacs-vm.spec b/emacs-vm.spec
index 15b0b2f..a2b17a3 100644
--- a/emacs-vm.spec
+++ b/emacs-vm.spec
@@ -6,18 +6,19 @@
 # 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)
-# rebuild emacs-vm with BuildRequires: emacs-bbdb-el. Or vice versa.
+# emacs-bbdb (ii) build emacs-bbdb with BuildRequires: emacs-vm (iii)
+# rebuild emacs-vm with BuildRequires: emacs-bbdb. Or vice versa.
 %global bbdbsupport 1
 
 %global pkgdir %{_emacs_sitelispdir}/vm
 %global pixmapdir %{pkgdir}/pixmaps
 %global initfile %{_emacs_sitestartdir}/vm-mode-init.el
 
-Summary: Emacs VM mailreader
+Summary: Emacs VM mail reader
+Summary(sv): Emacs postläsare VM
 Name: emacs-vm
 Version: 8.1.2
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 URL: https://launchpad.net/vm
@@ -29,15 +30,11 @@ Patch0: %{name}-8.1.2-useragent.patch
 # needs to be adjusted approrpiately.
 # https://bugs.launchpad.net/vm/+bug/1181584
 Patch1: emacs-vm-8.1.2-texinfo5.patch
-Requires: emacs >= %{_emacs_version}
+Requires: emacs(bin) >= %{_emacs_version}
 Requires(pre): /sbin/install-info 
 Requires(post): /sbin/install-info 
 BuildRequires: emacs texinfo texinfo-tex
 
-# This obsoletes and provides can be removed in Fedora 20
-Obsoletes: emacs-vm-el <= 8.1.2-1
-Provides: emacs-vm-el <= 8.1.2-1
-
 %if %{bbdbsupport}
 BuildRequires: emacs-bbdb
 Requires: emacs-bbdb
@@ -52,6 +49,15 @@ more advanced commands that do tasks like bursting and creating
 digests, message forwarding, and organizing message presentation
 according to various criteria. 
 
+%description -l sv
+VM (View Mail) är ett undersystem för Emacs som gör att UNIX e-post
+kan läsas och hanteras inifrån Emacs.  Det finns kommandon för att
+göra de vanliga sakerna som förväntas av ett postprogram, såsom skapa
+svar, spara meddelanden till mappar, radera meddelanden och så vidare.
+Det finns andra mer avancerade kommandon som gör saker som att
+splittra upp eller skapa sammandrag, vidarebefordra meddelanden och
+organisera presentationen av meddelanden enligt olika kriterier.
+
 %prep
 %setup -q -n vm-%{version}
 %patch0 -p0 -b .useragent
@@ -95,9 +101,6 @@ cat > %{buildroot}/%{initfile} <<EOF
     (u-vm-color-fontify-buffer))
 EOF
 
-%clean
-rm -rf %{buildroot}
-
 %post 
 /sbin/install-info %{_infodir}/vm.info.gz %{_infodir}/dir 2>/dev/null || :
 
@@ -111,12 +114,20 @@ fi
 %doc README COPYING
 %doc %{_infodir}/*
 %{_bindir}/*
-%{pixmapdir}
 %{pkgdir}
-%{pkgdir}/version.txt
 %{initfile}
 
 %changelog
+* Mon May 20 2013 Göran Uddeborg <goeran at uddeborg.se> - 8.1.2-7
+- Remove some duplicates in the files section.
+- Remove clean section no longer needed.
+- Remove defattr declaration no longer needed.
+- Swedish translation of summary and description added.
+- Update comments to reflect that .el files are now included in the base
+  package rather than the -el subpackage.
+- The Obsoletes/Provides declaration for the -el subpackage are no longer
+  needed in F20.
+
 * Sun May 19 2013 Göran Uddeborg <goeran at uddeborg.se> - 8.1.2-6
 - Patch texinfo files so they can be formatted with texinfo 5.