Initial original import from: fuse-2.4.2-2.fc4

[captive.git] / captive.spec.in

diff --git a/captive.spec.in b/captive.spec.in
index 174056a..b163f72 100644 (file)
--- 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
@@ -214,6 +214,7 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 /usr/lib/lsb/install_initd @PACKAGE@ 2>/dev/null || \
                /sbin/chkconfig --add @PACKAGE@
+touch %{_var}/lock/subsys/@PACKAGE@
 
 %if ! %{static}
 %post install
@@ -224,6 +225,14 @@ rm -rf $RPM_BUILD_ROOT
 %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
@@ -234,12 +243,6 @@ rm -rf $RPM_BUILD_ROOT
 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@
-
 %files
 %defattr(-,root,root)
 %doc README NEWS AUTHORS THANKS TODO