rpms/openafs/F-13 .cvsignore, 1.2, 1.3 afs.conf, 1.1, 1.2 openafs.init, 1.1, 1.2 openafs.spec, 1.1, 1.2 sources, 1.2, 1.3

[Jack Neely]

Author: jjneely

Update of /cvs/free/rpms/openafs/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv32624

Modified Files:
	.cvsignore afs.conf openafs.init openafs.spec sources 
Log Message:
* Wed Jun 16 2010 Jack Neely <jjneely at ncsu.edu> 0:1.4.12.1-2
- RPMFusion Bug #1274 - OpenAFS wont start without an IP address
- RPMFusion Bug #1277 - Include OpenAFS man pages
- Avoid using the rpm configure macro and call configure directly



Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/openafs/F-13/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	27 May 2010 19:38:20 -0000	1.2
+++ .cvsignore	16 Jun 2010 21:19:22 -0000	1.3
@@ -1 +1,2 @@
+openafs-1.4.12.1-doc.tar.bz2
 openafs-1.4.12.1-src.tar.bz2


Index: afs.conf
===================================================================
RCS file: /cvs/free/rpms/openafs/F-13/afs.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- afs.conf	27 May 2010 19:38:20 -0000	1.1
+++ afs.conf	16 Jun 2010 21:19:22 -0000	1.2
@@ -16,6 +16,8 @@
 LARGE="-stat 2800 -dcache 2400 -daemons 5 -volumes 128"
 MEDIUM="-stat 2000 -dcache 800 -daemons 3 -volumes 70"
 SMALL="-stat 300 -dcache 100 -daemons 2 -volumes 50"
+# In NetworkManager setups where AFS starts before the machine
+# has an IP address you will need the -dynroot option to function
 OPTIONS="$MEDIUM -nosettime -memcache -afsdb -dynroot"
 
 # Set some sane sysnames -- figure out what we are


Index: openafs.init
===================================================================
RCS file: /cvs/free/rpms/openafs/F-13/openafs.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openafs.init	27 May 2010 19:38:20 -0000	1.1
+++ openafs.init	16 Jun 2010 21:19:22 -0000	1.2
@@ -74,25 +74,7 @@
 	fi
 }
 
-# do you actually have a usable network interface up?
-on_network() {
-    ADDRS=`ifconfig | grep 'inet addr' | grep -v 127.0.0.1 | wc -l`
-    if [ "$ADDRS" = "" ]; then
-       echo $"$0: No interfaces with IP address"
-       return 1
-    elif [ $ADDRS = 0 ]; then
-       echo $"$0: No interfaces with IP address"
-       return 1
-    fi
-    return 0
-}
-
 start() {
-    on_network
-    RETVAL=$?
-
-    [ $RETVAL -eq 0 ] || return $RETVAL
-
     # Load kernel module
     action $"Loading AFS kernel module: " /sbin/modprobe openafs 
     RETVAL=$?


Index: openafs.spec
===================================================================
RCS file: /cvs/free/rpms/openafs/F-13/openafs.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openafs.spec	27 May 2010 19:38:20 -0000	1.1
+++ openafs.spec	16 Jun 2010 21:19:22 -0000	1.2
@@ -13,15 +13,16 @@
 Summary:        Enterprise Network File System
 Name:           openafs
 Version:        1.4.12.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        IBM
 Group:          System Environment/Daemons
 URL:            http://www.openafs.org
 Source0:        http://www.openafs.org/dl/openafs/1.4.12/%{name}-%{version}-src.tar.bz2
-Source1:        CellServDB
-Source2:        cacheinfo
-Source3:        openafs.init
-Source4:        afs.conf
+Source1		http://www.openafs.org/dl/openafs/1.4.12}/openafs-%{version}-doc.tar.bz2
+Source11:        CellServDB
+Source12:        cacheinfo
+Source13:        openafs.init
+Source14:        afs.conf
 
 BuildRoot:      %{_tmppath}/%{name}-root
 BuildRequires:  krb5-devel, pam-devel, ncurses-devel, flex, byacc, bison
@@ -86,7 +87,7 @@
 Cell.
 
 %prep
-%setup -q -n openafs-%{version}
+%setup -q -b 1 -n openafs-%{version}
 
 # Convert the licese to UTF-8
 mv src/LICENSE src/LICENSE~
@@ -100,10 +101,15 @@
 ./regen.sh
 
 # build the user-space bits for base architectures
-    %configure \
+    ./configure \
+        --prefix=%{_prefix} \
+        --libdir=%{_libdir} \
+        --bindir=%{_bindir} \
+        --sbindir=%{_sbindir} \
         --with-afs-sysname=%{sysname} \
         --with-linux-kernel-headers=%{ksource_dir} \
         --disable-kernel-module \
+        --disable-strip-binaries \
         --with-krb5-conf=/usr/kerberos/bin/krb5-config
 
     # Build is not SMP compliant
@@ -119,17 +125,17 @@
 
 # install config info
 mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/openafs
-install -p -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/openafs
-install -p -m 644 %{SOURCE2} ${RPM_BUILD_ROOT}%{_sysconfdir}/openafs
+install -p -m 644 %{SOURCE11} ${RPM_BUILD_ROOT}%{_sysconfdir}/openafs
+install -p -m 644 %{SOURCE12} ${RPM_BUILD_ROOT}%{_sysconfdir}/openafs
 echo %{thiscell} > ${RPM_BUILD_ROOT}%{_sysconfdir}/openafs/ThisCell
 
 # install the init script
 mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d
-install -m 755 %{SOURCE3} ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d/openafs
+install -m 755 %{SOURCE13} ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d/openafs
 
 # sysconfig file
 mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
-install -m 644 %{SOURCE4} ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/openafs
+install -m 644 %{SOURCE14} ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/openafs
 
 # Include the vlclient binary
 install -m 755 src/vlserver/vlclient ${RPM_BUILD_ROOT}/usr/sbin/vlclient
@@ -152,6 +158,21 @@
 rm -f ${RPM_BUILD_ROOT}/usr/bin/dlog
 rm -f ${RPM_BUILD_ROOT}/usr/bin/dpass
 
+# Install man pages
+tar cf - -C doc/man-pages man1 man5 man8 | \
+    tar xf - -C $RPM_BUILD_ROOT%{_mandir}
+
+# remove unused man pages
+for x in afs_ftpd afs_inetd afs_login afs_rcp afs_rlogind afs_rsh \
+    dkload knfs package runntp symlink symlink_list symlink_make \
+    symlink_remove; do
+        rm -f $RPM_BUILD_ROOT%{_mandir}/man1/${x}.1
+done
+
+# rename man page kpasswd to kapasswd
+mv $RPM_BUILD_ROOT%{_mandir}/man1/kpasswd.1 \
+   $RPM_BUILD_ROOT%{_mandir}/man1/kapasswd.1
+
 # don't restart in %post because kernel modules could well have changed
 %post
 /sbin/ldconfig
@@ -218,6 +239,9 @@
 %{_libdir}/libafsrpc.so.*
 %{_libdir}/libafssetpag.so.*
 /%{_lib}/security/*.so
+%{_mandir}/man1/*
+%{_mandir}/man5/*
+%{_mandir}/man8/*
 
 %files client
 %defattr(-, root, root)
@@ -271,6 +295,11 @@
 
 
 %changelog
+* Wed Jun 16 2010 Jack Neely <jjneely at ncsu.edu> 0:1.4.12.1-2
+- RPMFusion Bug #1274 - OpenAFS wont start without an IP address
+- RPMFusion Bug #1277 - Include OpenAFS man pages
+- Avoid using the rpm configure macro and call configure directly
+
 * Thu May 27 2010 Jack Neely <jjneely at ncsu.edu> 0:1.4.12.1-1
 - Build for F-13
 - Port forward to 1.4.12.1


Index: sources
===================================================================
RCS file: /cvs/free/rpms/openafs/F-13/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 May 2010 19:38:20 -0000	1.2
+++ sources	16 Jun 2010 21:19:22 -0000	1.3
@@ -1 +1,2 @@
+23041583f982796da3965979537a4ef1  openafs-1.4.12.1-doc.tar.bz2
 c45a8ca3b4605e9dac25ff435c60d512  openafs-1.4.12.1-src.tar.bz2