ORBit2 requirement: 2.8.3

[captive.git] / captive.spec.in

diff --git a/captive.spec.in b/captive.spec.in
index f68163a..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
@@ -280,7 +280,9 @@ fi
 %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@