From b76d94226853b18b19b6d2d04cc881da6115af41 Mon Sep 17 00:00:00 2001
From: Michel Alexandre Salim <salimma@fedoraproject.org>
Date: May 12 2012 10:28:44 +0000
Subject: Further spec clean-ups


---

diff --git a/vala.spec b/vala.spec
index bae603e..c43b48f 100644
--- a/vala.spec
+++ b/vala.spec
@@ -1,4 +1,5 @@
 %global api_ver 0.18
+%global priority 90
 
 Name:           vala
 Version:        0.17.0
@@ -77,8 +78,6 @@ Group:          Development/Languages
 License:        LGPLv2+
 Requires:       %{name} = %{version}-%{release}
 Requires:       gnome-common intltool libtool pkgconfig
-Provides:       %{name}-vapigen = %{version}-%{release}
-Obsoletes:      %{name}-vapigen < %{version}-%{release}
 
 %description    tools
 Vala is a new programming language that aims to bring modern programming
@@ -98,12 +97,6 @@ License:        LGPLv2+
 BuildArch:      noarch
 Requires:       %{name} = %{version}-%{release}
 Requires:       devhelp
-Provides:       %{name}-docs = %{version}-%{release}
-Obsoletes:      %{name}-docs < %{version}-%{release}
-# might seem redundant, but needed to kill off the old arch-ed -doc
-# subpackage
-Obsoletes:      %{name}-doc < %{version}-%{release}
-
 
 %description    doc
 Vala is a new programming language that aims to bring modern programming
@@ -120,8 +113,6 @@ Group:          Applications/Editors
 License:        GPLv2+
 
 BuildArch:      noarch
-# Provide upgrade path from older, arch-specific package
-Obsoletes:      emacs-%{name} < %{version}-%{release}
 Requires:       emacs(bin) >= %{_emacs_version}
 
 
@@ -190,42 +181,25 @@ cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_emacs_sitestartdir}
 /sbin/ldconfig
 for f in %{vala_binaries};
 do
-    if [ -L /etc/alternatives/$f ];
-    then
-        # older vala packages fail to remove alternatives on upgrade
-        %{_sbindir}/alternatives --remove $f $(readlink /etc/alternatives/$f)
-    fi
     %{_sbindir}/alternatives --install %{_bindir}/$f \
-      $f %{_bindir}/$f-%{api_ver} 90
+      $f %{_bindir}/$f-%{api_ver} %{priority}
 done
 for f in %{vala_manpages};
 do
-    if [ -L /etc/alternatives/$f ];
-    then
-        %{_sbindir}/alternatives --remove $f $(readlink /etc/alternatives/$f)
-    fi
     %{_sbindir}/alternatives --install %{_mandir}/man1/$f.1.gz \
-      $f.1.gz %{_mandir}/man1/$f-%{api_ver}.1.gz 90
+      $f.1.gz %{_mandir}/man1/$f-%{api_ver}.1.gz %{priority}
 done
 
 %posttrans tools
 for f in %{vala_tools_binaries};
 do
-    if [ -L /etc/alternatives/$f ];
-    then
-        %{_sbindir}/alternatives --remove $f $(readlink /etc/alternatives/$f)
-    fi
     %{_sbindir}/alternatives --install %{_bindir}/$f \
-      $f %{_bindir}/$f-%{api_ver} 90
+      $f %{_bindir}/$f-%{api_ver} %{priority}
 done
 for f in %{vala_tools_manpages};
 do
-    if [ -L /etc/alternatives/$f ];
-    then
-        %{_sbindir}/alternatives --remove $f $(readlink /etc/alternatives/$f)
-    fi
     %{_sbindir}/alternatives --install %{_mandir}/man1/$f.1.gz \
-      $f.1.gz %{_mandir}/man1/$f-%{api_ver}.1.gz 90
+      $f.1.gz %{_mandir}/man1/$f-%{api_ver}.1.gz %{priority}
 done
 
 %preun
@@ -305,9 +279,8 @@ done
 
 
 %changelog
-* Fri May 11 2012 Michel Salim <salimma@fedoraproject.org> - 0.17.0-2
+* Sat May 12 2012 Michel Salim <salimma@fedoraproject.org> - 0.17.0-2
 - Spec clean-ups
-- Make alternative scriptlet less noisy (Ralph Bean)
 
 * Thu May  3 2012 Michel Salim <salimma@fedoraproject.org> - 0.17.0-1
 - Update to 0.17.0