[vala/f17] Further spec clean-ups
Michel Alexandre Salim
salimma at fedoraproject.org
Sat May 12 10:31:10 UTC 2012
commit d76be7f5fd189f079fe236516f6ab04256d80fb4
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date: Sat May 12 17:28:44 2012 +0700
Further spec clean-ups
vala.spec | 39 ++++++---------------------------------
1 files changed, 6 insertions(+), 33 deletions(-)
---
diff --git a/vala.spec b/vala.spec
index 89fede3..ef1af31 100644
--- a/vala.spec
+++ b/vala.spec
@@ -1,4 +1,5 @@
%global api_ver 0.16
+%global priority 90
Name: vala
Version: 0.16.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 at fedoraproject.org> - 0.16.0-4
+* Sat May 12 2012 Michel Salim <salimma at fedoraproject.org> - 0.16.0-4
- Spec clean-ups
-- Make alternative scriptlet less noisy (Ralph Bean)
* Fri Apr 6 2012 Michel Salim <salimma at fedoraproject.org> - 0.16.0-3
- Disable coverage analysis, build-time paths get hard-coded
More information about the scm-commits
mailing list