-Mandrake package script fails during upgrade ('rpm -U') on missing dependencies.

[captive.git] / captive.spec.in

diff --git a/captive.spec.in b/captive.spec.in
index efaaf7a..a1a7ec3 100644 (file)
--- a/captive.spec.in
+++ b/captive.spec.in
@@ -31,6 +31,8 @@ Copyright: GPL
 BuildRoot: /var/tmp/@PACKAGE@-@VERSION@-%{release}-root
 BuildRequires: ORBit2-devel
 Requires: ORBit2
+# Due to --with-orbit-line=linc
+Conflicts: ORBit2 >= 2.7.0
 BuildRequires: openssl-devel
 Requires: openssl
 BuildRequires: gnome-vfs2-devel
@@ -128,7 +130,8 @@ NTFS disks will become mount(8)able at directories: /mnt/captive-VOLUME_NAME
                --enable-man-pages \
                --enable-sbin-mountdir=/sbin \
                --enable-sbin-mount-fs=ntfs:fastfat:cdfs:ext2fsd \
-               --disable-gtk-doc
+               --disable-gtk-doc \
+               --with-orbit-line=linc
 make
 
 %install
@@ -139,16 +142,18 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/ldconfig
-/usr/sbin/useradd -c "Captive Sandbox" -s /sbin/nologin -r -d %{_var}/lib/@PACKAGE@ captive 2>/dev/null || true
+/usr/sbin/groupadd -r captive 2>/dev/null || true
+/usr/sbin/useradd -c "Captive Sandbox" -s /sbin/nologin -r -g captive -d %{_var}/lib/@PACKAGE@ captive 2>/dev/null || true
 
 %postun
 /sbin/ldconfig
 # Remove stale sandbox chroot directories owned by 'captive.captive':
-rm -rf %{_var}/lib/@PACKAGE@/sandbox-server-*
+rm -rf %{_var}/lib/@PACKAGE@/s-*
+rm -rf %{_var}/lib/@PACKAGE@/tmp/*
 
 %files
 %defattr(-,root,root)
-%doc README NEWS AUTHORS TODO
+%doc README NEWS AUTHORS THANKS TODO
 %{_libdir}/lib@PACKAGE@-@VERSION@.so
 %attr(644,root,root) %{_mandir}/man?/@PACKAGE@.*
 %{_libdir}/gnome-vfs-2.0/modules/lib@PACKAGE@-gnomevfs-@VERSION@.so