X-Git-Url: http://git.jankratochvil.net/?p=captive.git;a=blobdiff_plain;f=captive.spec.in;h=fb40bebc5be0f40de588c5833e6923a23950ac90;hp=fc01561330ed7d5c89613fbf81ee4da34ea65dd5;hb=HEAD;hpb=19e7bd5e57fecb44a0d7cb7e8b824b4747fe26c4

diff --git a/captive.spec.in b/captive.spec.in
index fc01561..fb40beb 100644
--- a/captive.spec.in
+++ b/captive.spec.in
@@ -17,7 +17,7 @@
 
 
 # Build fully statically.
-# /usr/local/devel-static is required to contain static libraries.
+# /usr/local/staticbuild is required to contain static libraries.
 %define static 1
 
 
@@ -34,14 +34,15 @@ Name: @PACKAGE@
 Version: @VERSION@
 Release: %{release}
 Group: System Environment/Base
-Packager: Jan Kratochvil <project-captive@jankratochvil.net>
+Packager: Jan Kratochvil <lace@jankratochvil.net>
 Source: http://www.jankratochvil.net/project/captive/dist/@PACKAGE@-@VERSION@.tar.gz
 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
@@ -91,6 +91,8 @@ were analyzed and successfuly emulated in the GNU/Linux operating system.
 The implementation allows applications running under the GNU/Linux operating
 system to access NTFS drives. File system driver compatibility with VFAT,
 ISO9660 and EXT2 is also provided.
+
+http://www.jankratochvil.net/project/captive/
 %if %{static}
 This packaging is a standalone static version, no other packages are needed.
 
@@ -120,7 +122,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 +166,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/staticbuild/include/gnome-vfs-module-2.0"
 %configure \
 		--disable-shared --enable-static \
 		--enable-standalone \
@@ -209,19 +212,22 @@ rm -rf $RPM_BUILD_ROOT
 %pre fuse
 %endif
 %if %{static}
-/usr/sbin/groupadd -r fuse 2>/dev/null || \
-   /usr/sbin/groupadd fuse 2>/dev/null || \
-   true
+/usr/sbin/groupadd -r                                  fuse 2>/dev/null || \
+   /usr/sbin/groupadd                                  fuse 2>/dev/null || \
+   /usr/sbin/adduser --quiet --system --no-create-home fuse 2>/dev/null || \
+   echo >&2 "WARNING: Failed to create system group: fuse"
 %endif
 
 %post
 /sbin/ldconfig
-/usr/sbin/groupadd -r captive 2>/dev/null || \
-   /usr/sbin/groupadd captive 2>/dev/null || \
-   true
+/usr/sbin/groupadd -r                  captive 2>/dev/null || \
+   /usr/sbin/groupadd                  captive 2>/dev/null || \
+   /usr/sbin/addgroup --system --quiet captive 2>/dev/null || \
+   echo >&2 "WARNING: Failed to create system group: captive"
 /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
+   /usr/sbin/adduser --quiet --system --no-create-home            --home %{_var}/lib/@PACKAGE@ captive 2>/dev/null || \
+   echo >&2 "WARNING: Failed to create system user: captive"
 
 %if ! %{static}
 %post fuse
@@ -279,7 +285,10 @@ 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@
@@ -300,7 +309,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