Author: jjneely Update of /cvs/free/rpms/openafs/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv17315 Modified Files: openafs.init openafs.spec sources Log Message: * Tue Jun 30 2010 Jack Neely <jjneely(a)ncsu.edu&gt; 0:1.4.12.1-3 - Correct rpmlint warnings - RPMFusion Bug #1047 - Fix SELinux contexts on /afs - RPMFusion Bug #1275 - service openafs status now sets the exit code Index: openafs.init =================================================================== RCS file: /cvs/free/rpms/openafs/devel/openafs.init,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- openafs.init 10 Jun 2010 21:14:05 -0000 1.1 +++ openafs.init 30 Jun 2010 18:31:08 -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=$? @@ -205,11 +187,8 @@ fi ;; status) - if [ -f /var/lock/subsys/openafs ]; then - echo $"AFS appears to be running" - else - echo $"AFS does not appear to be running" - fi + status afsd + RETVAL=$? ;; *) echo $"Usage: $0 {start|stop|restart|reload|condrestart|status}" Index: openafs.spec =================================================================== RCS file: /cvs/free/rpms/openafs/devel/openafs.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- openafs.spec 10 Jun 2010 21:14:05 -0000 1.1 +++ openafs.spec 30 Jun 2010 18:31:08 -0000 1.2 @@ -13,15 +13,16 @@ Summary: Enterprise Network File System Name: openafs Version: 1.4.12.1 -Release: 2%{?dist} +Release: 3%{?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 @@ -37,12 +38,12 @@ %package client -Summary: OpenAFS Filesystem client -Group: System Environment/Daemons +Summary: OpenAFS Filesystem client +Group: System Environment/Daemons Requires(post): bash, coreutils, chkconfig -Requires: %{name}-kmod >= %{version} -Requires: openafs = %{version} -Provides: %{name}-kmod-common = %{version} +Requires: %{name}-kmod >= %{version} +Requires: openafs = %{version} +Provides: %{name}-kmod-common = %{version} %description client The AFS distributed filesystem. AFS is a distributed filesystem @@ -55,9 +56,9 @@ %package devel -Summary: OpenAFS development header files and static libraries -Group: Development/Libraries -Requires: openafs = %{version}-%{release} +Summary: OpenAFS development header files and static libraries +Group: Development/Libraries +Requires: openafs = %{version}-%{release} Requires(post): /sbin/ldconfig %description devel @@ -72,9 +73,9 @@ %package server -Summary: OpenAFS Filesystem Server -Group: System Environment/Daemons -Requires: openafs-client = %{version}, openafs = %{version} +Summary: OpenAFS Filesystem Server +Group: System Environment/Daemons +Requires: openafs-client = %{version}, openafs = %{version} %description server The AFS distributed filesystem. AFS is a distributed filesystem @@ -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/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,7 +158,22 @@ rm -f ${RPM_BUILD_ROOT}/usr/bin/dlog rm -f ${RPM_BUILD_ROOT}/usr/bin/dpass -# don't restart in %post because kernel modules could well have changed +# 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 if [ $1 = 1 ]; then @@ -163,6 +184,7 @@ # if this is owned by the package, upgrades with afs running can't work if [ ! -d /afs ] ; then mkdir -m 700 /afs + [ -x /sbin/restorecon ] && /sbin/restorecon /afs fi exit 0 @@ -218,6 +240,9 @@ %{_libdir}/libafsrpc.so.* %{_libdir}/libafssetpag.so.* /%{_lib}/security/*.so +%{_mandir}/man1/* +%{_mandir}/man5/* +%{_mandir}/man8/* %files client %defattr(-, root, root) @@ -271,6 +296,16 @@ %changelog +* Tue Jun 30 2010 Jack Neely <jjneely(a)ncsu.edu&gt; 0:1.4.12.1-3 +- Correct rpmlint warnings +- RPMFusion Bug #1047 - Fix SELinux contexts on /afs +- RPMFusion Bug #1275 - service openafs status now sets the exit code + +* Wed Jun 16 2010 Jack Neely <jjneely(a)ncsu.edu&gt; 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 Jun 10 2010 Jack Neely <jjneely(a)ncsu.edu&gt; 0:1.4.12.1-2 - Port to rawhide - krb5-devel 1.8 moves where the kerberos tools live Index: sources =================================================================== RCS file: /cvs/free/rpms/openafs/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 10 Jun 2010 21:14:05 -0000 1.2 +++ sources 30 Jun 2010 18:31:08 -0000 1.3 @@ -1 +1,2 @@ +23041583f982796da3965979537a4ef1 openafs-1.4.12.1-doc.tar.bz2 c45a8ca3b4605e9dac25ff435c60d512 openafs-1.4.12.1-src.tar.bz2