ORBit2 requirement: 2.8.3

[captive.git] / captive.spec.in

diff --git a/captive.spec.in b/captive.spec.in
index 6b53248..d317444 100644 (file)
--- a/captive.spec.in
+++ b/captive.spec.in
@@ -39,9 +39,10 @@ Source: http://www.jankratochvil.net/project/captive/dist/@PACKAGE@-@VERSION@.ta
 License: GPL
 BuildRoot: /var/tmp/@PACKAGE@-@VERSION@-%{release}-root
 BuildRequires: ORBit2-devel
-# Due to --with-orbit-line=link
+# >= 2.7.0 due to --with-orbit-line=link
+# >= 2.8.3 due to Mandrake-9.2 bugreport.
 %if ! %{static}
-Requires: ORBit2 >= 2.7.0
+Requires: ORBit2 >= 2.8.3
 %endif
 BuildRequires: openssl-devel
 %if ! %{static}
@@ -68,7 +69,6 @@ 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
@@ -120,7 +120,7 @@ BuildRequires: ntfsprogs-devel >= 1.8.0
 PreReq: ntfsprogs >= 1.8.0
 Requires: ntfsprogs >= 1.8.0
 Requires: ntfsprogs-gnomevfs
-Requires: gnome-vfs-httpcaptive
+Obsoletes: gnome-vfs-httpcaptive
 BuildRequires: gnome-vfs2-devel
 Requires: gnome-vfs2
 BuildRequires: libgnomeui-devel
@@ -174,6 +174,7 @@ NTFS disks will become mount(8)able at directories: /mnt/captive-VOLUME_NAME
                --disable-standalone \
                --disable-standalone-fonts \
 %endif
+               --disable-standalone-yum \
                --with-readline \
                --disable-bug-replay \
                --disable-lufs \
@@ -189,6 +190,8 @@ NTFS disks will become mount(8)able at directories: /mnt/captive-VOLUME_NAME
                --disable-gtk-doc \
                --with-orbit-line=link
 
+#              --enable-standalone-yum=%{_sysconfdir}/yum.repos.d
+
 make
 %if %{static}
 ./build-static link
@@ -238,21 +241,30 @@ touch %{_var}/lock/subsys/@PACKAGE@
 %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@
+# Only on real erase, not on upgrade:
+if [ $1 = 0 ];then
+       /usr/lib/lsb/remove_initd @PACKAGE@ 2>/dev/null || \
+                       /sbin/chkconfig --del @PACKAGE@
+       %{_initrddir}/@PACKAGE@ stop
+       rm -f %{_var}/lock/subsys/@PACKAGE@
+fi
 
 %if ! %{static}
 %preun install
 %endif
-%{_sbindir}/captive-install-fstab --remove
+# Only on real erase, not on upgrade:
+if [ $1 = 0 ];then
+       %{_sbindir}/captive-install-fstab --remove
+fi
 
 %postun
 /sbin/ldconfig
-# Remove stale sandbox chroot directories owned by 'captive.captive':
-rm -rf %{_var}/lib/@PACKAGE@/s-*
-rm -rf %{_var}/lib/@PACKAGE@/tmp/*
+# Only on real erase, not on upgrade:
+if [ $1 = 0 ];then
+       # Remove stale sandbox chroot directories owned by 'captive.captive':
+       rm -rf %{_var}/lib/@PACKAGE@/s-*
+       rm -rf %{_var}/lib/@PACKAGE@/tmp/*
+fi
 
 %files
 %defattr(-,root,root)
@@ -267,7 +279,11 @@ rm -rf %{_var}/lib/@PACKAGE@/tmp/*
 %attr(644,root,root) %{_mandir}/man?/@PACKAGE@-cmdline.*
 %attr(4755,root,root) %{_libexecdir}/@PACKAGE@-sandbox-server
 %attr(644,root,root) %{_mandir}/man?/@PACKAGE@-sandbox-server.*
+%config %{_sysconfdir}/w32-mod-id.captivemodid.xml
+%if ! %{static}
 %config %{_sysconfdir}/gnome-vfs-2.0/modules/@PACKAGE@.conf
+%endif
+# %config %{_sysconfdir}/yum.repos.d/*
 %{_datadir}/locale/*/LC_MESSAGES/@PACKAGE@.mo
 %{_var}/lib/@PACKAGE@
 
@@ -287,7 +303,6 @@ rm -rf %{_var}/lib/@PACKAGE@/tmp/*
 %files install
 %endif
 %defattr(-,root,root)
-%config %{_sysconfdir}/w32-mod-id.captivemodid.xml
 %{_sbindir}/captive-install-fstab
 %attr(644,root,root) %{_mandir}/man?/captive-install-fstab.*
 %{_sbindir}/captive-install-acquire