[vala-compat/f17] Lower priority of alternatives to 10 (prioritize main vala package)

[Michel Alexandre Salim]

commit f6b6cd4149edf9256f315742fb0567beaee649a6
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Sat May 12 11:05:43 2012 +0700

    Lower priority of alternatives to 10 (prioritize main vala package)
    
    - Remove upgrade-path workaround inherited from Vala

 vala-compat.spec |   32 ++++++++++----------------------
 1 files changed, 10 insertions(+), 22 deletions(-)
---
diff --git a/vala-compat.spec b/vala-compat.spec
index 1e0a390..27289c5 100644
--- a/vala-compat.spec
+++ b/vala-compat.spec
@@ -1,8 +1,9 @@
 %global api_ver 0.14
+%global priority 10
 
 Name:           vala-compat
 Version:        0.14.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A modern programming language for GNOME
 
 Group:          Development/Languages
@@ -139,42 +140,25 @@ rm $RPM_BUILD_ROOT%{_libdir}/libvala-%{api_ver}.la
 /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
@@ -242,6 +226,10 @@ done
 
 
 %changelog
+* Sat May 12 2012 Michel Salim <salimma at fedoraproject.org> - 0.14.2-4
+- Lower priority of alternatives to 10 (prioritize main vala package)
+- Remove upgrade-path workaround inherited from Vala
+
 * Fri May 11 2012 Michel Salim <salimma at fedoraproject.org> - 0.14.2-3
 - Remove subpackage-renaming logic; not needed since this is the first
   vala-compat release