X-Git-Url: http://git.jankratochvil.net/?a=blobdiff_plain;f=captive.spec.in;h=55f5641a7827f15dff5a8f489d95c748c1ba20e8;hb=b94095a878e67492771b2bc956fafb1cb74d9da9;hp=d470b52f280b9dd7e719847f2a4ef92e4c5feba5;hpb=c7e2c90ccb32c9b202a7f92c13586dc929936463;p=captive.git

diff --git a/captive.spec.in b/captive.spec.in
index d470b52..55f5641 100644
--- a/captive.spec.in
+++ b/captive.spec.in
@@ -68,6 +68,7 @@ BuildRequires: readline-devel
 Requires: readline
 %endif
 BuildRequires: gcc >= 3.0
+Obsoletes: gnome-vfs-httpcaptive
 %if %{static}
 BuildRequires: fuse-devel
 BuildRequires: ntfsprogs-devel >= 1.8.0
@@ -75,7 +76,6 @@ BuildRequires: libgnomeui-devel
 Obsoletes: @PACKAGE@
 Obsoletes: @PACKAGE@-lufs
 Obsoletes: @PACKAGE@-install
-Obsoletes: gnome-vfs-httpcaptive
 # FIXME: ?: ntfsprogs-gnomevfs < 1.1
 %else
 Conflicts: @PACKAGE@-static
@@ -204,7 +204,7 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/ldconfig
 /usr/sbin/groupadd -r captive 2>/dev/null || \
    /usr/sbin/groupadd captive 2>/dev/null || \
-	 true
+   true
 /usr/sbin/useradd -r -c "Captive Sandbox" -s /sbin/nologin -g captive -d %{_var}/lib/@PACKAGE@ captive 2>/dev/null || \
    /usr/sbin/useradd -c "Captive Sandbox" -s /sbin/nologin -g captive -d %{_var}/lib/@PACKAGE@ captive 2>/dev/null || \
    true
@@ -212,6 +212,11 @@ rm -rf $RPM_BUILD_ROOT
 %if ! %{static}
 %post fuse
 %endif
+%if %{static}
+/usr/sbin/groupadd -r fuse 2>/dev/null || \
+   /usr/sbin/groupadd fuse 2>/dev/null || \
+   true
+%endif
 /usr/lib/lsb/install_initd @PACKAGE@ 2>/dev/null || \
 		/sbin/chkconfig --add @PACKAGE@
 touch %{_var}/lock/subsys/@PACKAGE@
@@ -225,6 +230,14 @@ touch %{_var}/lock/subsys/@PACKAGE@
 %preun
 
 %if ! %{static}
+%preun fuse
+%endif
+/usr/lib/lsb/remove_initd @PACKAGE@ 2>/dev/null || \
+		/sbin/chkconfig --del @PACKAGE@
+%{_initrddir}/@PACKAGE@ stop
+rm -f %{_var}/lock/subsys/@PACKAGE@
+
+%if ! %{static}
 %preun install
 %endif
 %{_sbindir}/captive-install-fstab --remove
@@ -235,14 +248,6 @@ touch %{_var}/lock/subsys/@PACKAGE@
 rm -rf %{_var}/lib/@PACKAGE@/s-*
 rm -rf %{_var}/lib/@PACKAGE@/tmp/*
 
-%if ! %{static}
-%postun fuse
-%endif
-/usr/lib/lsb/remove_initd @PACKAGE@ 2>/dev/null || \
-		/sbin/chkconfig --del @PACKAGE@
-%{_initrddir}/@PACKAGE@ stop
-rm -f %{_var}/lock/subsys/@PACKAGE@
-
 %files
 %defattr(-,root,root)
 %doc README NEWS AUTHORS THANKS TODO
@@ -268,6 +273,9 @@ rm -f %{_var}/lock/subsys/@PACKAGE@
 /sbin/mount.@PACKAGE@
 /sbin/mount.@PACKAGE@-*
 %attr(644,root,root) %{_mandir}/man?/mount.@PACKAGE@.*
+%if %{static}
+%{_libexecdir}/@PACKAGE@-fusermount
+%endif
 
 %if ! %{static}
 %files install