diff --git a/tigervnc.changes b/tigervnc.changes index e3250cc..0fc70ff 100644 --- a/tigervnc.changes +++ b/tigervnc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Aug 18 13:58:30 UTC 2014 - sndirsch@suse.com + +- use update-alternatives only on openSUSE > 13.1 + ------------------------------------------------------------------- Mon Aug 18 11:07:09 UTC 2014 - msrb@suse.com diff --git a/tigervnc.spec b/tigervnc.spec index b7591d2..80e435f 100644 --- a/tigervnc.spec +++ b/tigervnc.spec @@ -81,8 +81,10 @@ BuildRequires: pkgconfig(xkbfile) BuildRequires: pkgconfig(xorg-macros) >= 1.14 BuildRequires: pkgconfig(xproto) >= 7.0.17 BuildRequires: pkgconfig(xtrans) >= 1.2.2 +%if 0%{?suse_version} >= 1315 Requires(post): update-alternatives Requires(postun): update-alternatives +%endif Url: http://sourceforge.net/apps/mediawiki/tigervnc/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: A high-performance, platform-neutral implementation of VNC @@ -223,11 +225,15 @@ install -D -m 755 %{SOURCE7} $RPM_BUILD_ROOT%{_bindir}/vnc_inetd_httpd install -D -m 644 %{SOURCE8} $RPM_BUILD_ROOT/etc/slp.reg.d/vnc.reg install -D -m 755 %{SOURCE9} $RPM_BUILD_ROOT%{_bindir}/vncpasswd.arg install -D -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{_datadir}/vnc/classes +%if 0%{?suse_version} >= 1315 ln -s -f %{_sysconfdir}/alternatives/vncviewer $RPM_BUILD_ROOT%{_bindir}/vncviewer ln -s -f %{_sysconfdir}/alternatives/vncviewer.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/vncviewer.1.gz +%endif %find_lang '%{name}' +%if 0%{?suse_version} >= 1315 + %post %_sbindir/update-alternatives \ --install %{_bindir}/vncviewer vncviewer %{_bindir}/vncviewer-tigervnc 20 \ @@ -238,6 +244,8 @@ if [ "$1" = 0 ] ; then "%_sbindir/update-alternatives" --remove vncviewer /usr/bin/vncviewer-tigervnc fi +%endif + %files -f %{name}.lang %defattr(-,root,root,-) %ghost %{_bindir}/vncviewer @@ -247,8 +255,10 @@ fi %doc README.txt %ghost %_mandir/man1/vncviewer.1.gz %doc %_mandir/man1/vncviewer-tigervnc.1.gz +%if 0%{?suse_version} >= 1315 %ghost %_sysconfdir/alternatives/vncviewer %ghost %_sysconfdir/alternatives/vncviewer.1.gz +%endif %files -n xorg-x11-Xvnc %defattr(-,root,root)