Hello community,

here is the log from the commit of package tightvnc for openSUSE:Factory 
checked in at 2014-08-27 07:46:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/tightvnc (Old)
 and      /work/SRC/openSUSE:Factory/.tightvnc.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "tightvnc"

Changes:
--------
--- /work/SRC/openSUSE:Factory/tightvnc/tightvnc.changes        2013-12-19 
12:37:58.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.tightvnc.new/tightvnc.changes   2014-08-27 
07:47:14.000000000 +0200
@@ -1,0 +2,5 @@
+Wed May 28 14:54:11 UTC 2014 - [email protected]
+
+- Use update-alternatives.
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ tightvnc.spec ++++++
--- /var/tmp/diff_new_pack.W7gdH8/_old  2014-08-27 07:47:15.000000000 +0200
+++ /var/tmp/diff_new_pack.W7gdH8/_new  2014-08-27 07:47:15.000000000 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package tightvnc
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -24,8 +24,9 @@
 Requires:       xdpyinfo
 Requires:       xinetd
 Requires:       xorg-x11-Xvnc
+Requires(post):   update-alternatives
+Requires(postun): update-alternatives
 Provides:       vnc
-Obsoletes:      vnc
 PreReq:         sed
 Summary:        A virtual X-Window System server
 License:        GPL-2.0+
@@ -78,17 +79,42 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -m755 -p $RPM_BUILD_ROOT/usr/bin
+mkdir -m755 -p $RPM_BUILD_ROOT%{_bindir}
 mkdir -m755 -p $RPM_BUILD_ROOT%_mandir/man1
-install -D -m 755 vncviewer/vncviewer $RPM_BUILD_ROOT%{_bindir}/vncviewer
+install -D -m 755 vncviewer/vncviewer 
$RPM_BUILD_ROOT%{_bindir}/vncviewer-tightvnc
 install -D -m 755 vncconnect/vncconnect $RPM_BUILD_ROOT%{_bindir}/vncconnect
-install -D -m 755 vncviewer/vncviewer.man 
$RPM_BUILD_ROOT%{_mandir}/man1/vncviewer.man.1
-install -D -m 755 vncconnect/vncconnect.man 
$RPM_BUILD_ROOT%{_mandir}/man1/vncconnect.man.1
+install -D -m 644 vncviewer/vncviewer.man 
$RPM_BUILD_ROOT%{_mandir}/man1/vncviewer-tightvnc.1
+install -D -m 644 vncconnect/vncconnect.man 
$RPM_BUILD_ROOT%{_mandir}/man1/vncconnect.1
+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
+
+# brp-25-symlink from opensuse <= 13.1 doesn't whitelist links leading to 
/etc/alternatives/*
+%if 0%{?suse_version} <= 1310
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/alternatives
+touch $RPM_BUILD_ROOT%{_sysconfdir}/alternatives/vncviewer
+touch $RPM_BUILD_ROOT%{_sysconfdir}/alternatives/vncviewer.1.gz
+%endif
+
+%post
+%_sbindir/update-alternatives \
+    --install %{_bindir}/vncviewer vncviewer %{_bindir}/vncviewer-tightvnc 10 \
+    --slave %{_mandir}/man1/vncviewer.1.gz  vncviewer.1.gz  
%{_mandir}/man1/vncviewer-tightvnc.1.gz
+
+%postun
+if [ "$1" = 0 ] ; then
+   %_sbindir/update-alternatives --remove vncviewer 
%{_bindir}/vncviewer-tightvnc
+fi
 
 %files
 %defattr(-,root,root)
+%{_bindir}/vncviewer
+%{_bindir}/vncviewer-tightvnc
+%{_bindir}/vncconnect
 %doc README LICENCE.TXT ChangeLog WhatsNew
-%doc %_mandir/*/*
-/usr/bin/*
+%doc %_mandir/man1/vncviewer.1.gz
+%doc %_mandir/man1/vncviewer-tightvnc.1.gz
+%doc %_mandir/man1/vncconnect.1.gz
+%ghost %_sysconfdir/alternatives/vncviewer
+%ghost %_sysconfdir/alternatives/vncviewer.1.gz
 
 %changelog

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to