X-Git-Url: http://git.jankratochvil.net/?a=blobdiff_plain;f=captive.spec.in;h=6cabdbee2830b97c504771d0435f470780a54dbe;hb=729fd3d6c07aba050261244c59f8feb9fa29549d;hp=5398db144e3dea7aa7f82630826ff402e8230653;hpb=04ce4dc0ef16efb6c5804f079ae56cc9dd3b92eb;p=captive.git

diff --git a/captive.spec.in b/captive.spec.in
index 5398db1..6cabdbe 100644
--- 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
@@ -164,6 +164,7 @@ NTFS disks will become mount(8)able at directories: /mnt/captive-VOLUME_NAME
 %endif
 # 'define' of rpm(1) does not accept line-continuation backslashes ('\').
 %if %{static}
+export CPPFLAGS="-I/usr/local/devel-static/include/gnome-vfs-module-2.0"
 %configure \
 		--disable-shared --enable-static \
 		--enable-standalone \
@@ -174,6 +175,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 +191,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
@@ -276,7 +280,11 @@ fi
 %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@
 
@@ -296,7 +304,6 @@ fi
 %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