rpms/openafs/F-12 openafs.spec,1.2,1.3 sources,1.3,1.4

[Jack Neely]

Author: jjneely

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

Modified Files:
	openafs.spec sources 
Log Message:
* Thu Jul 29 2010 Jack Neely <jjneely at ncsu.edu> 0:1.4.12.1-4
- port forward to 1.4.12.1
- backport bugfixes and enhancements from F-13 branch, including:
- RPMFusion Bug #1333 - aklog can't find configuration
- RPMFusion Bug #1047 - Fix SELinux contexts on /afs
- RPMFusion Bug #1275 - service openafs status now sets the exit code
- 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: openafs.spec
===================================================================
RCS file: /cvs/free/rpms/openafs/F-12/openafs.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openafs.spec	15 Mar 2010 21:39:40 -0000	1.2
+++ openafs.spec	29 Jul 2010 18:35:54 -0000	1.3
@@ -12,16 +12,17 @@
 
 Summary:        Enterprise Network File System
 Name:           openafs
-Version:        1.4.12
-Release:        1%{?dist}
+Version:        1.4.12.1
+Release:        4%{?dist}
 License:        IBM
 Group:          System Environment/Daemons
 URL:            http://www.openafs.org
-Source0:        http://www.openafs.org/dl/openafs/%{version}/%{name}-%{version}-src.tar.bz2
-Source1:        CellServDB
-Source2:        cacheinfo
-Source3:        openafs.init
-Source4:        afs.conf
+Source0:        http://www.openafs.org/dl/openafs/1.4.12/%{name}-%{version}-src.tar.bz2
+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,17 @@
 ./regen.sh
 
 # build the user-space bits for base architectures
-    %configure \
+    ./configure \
+        --prefix=%{_prefix} \
+        --libdir=%{_libdir} \
+        --bindir=%{_bindir} \
+        --sbindir=%{_sbindir} \
+        --sysconfdir=%{_sysconfdir} \
+        --localstatedir=%{_var} \
         --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 +127,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 +160,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
@@ -163,6 +186,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 +242,9 @@
 %{_libdir}/libafsrpc.so.*
 %{_libdir}/libafssetpag.so.*
 /%{_lib}/security/*.so
+%{_mandir}/man1/*
+%{_mandir}/man5/*
+%{_mandir}/man8/*
 
 %files client
 %defattr(-, root, root)
@@ -271,6 +298,16 @@
 
 
 %changelog
+* Thu Jul 29 2010 Jack Neely <jjneely at ncsu.edu> 0:1.4.12.1-4
+- port forward to 1.4.12.1
+- backport bugfixes and enhancements from F-13 branch, including:
+- RPMFusion Bug #1333 - aklog can't find configuration
+- RPMFusion Bug #1047 - Fix SELinux contexts on /afs
+- RPMFusion Bug #1275 - service openafs status now sets the exit code
+- 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
+
 * Mon Mar 15 2010 Jack Neely <jjneely at ncsu.edu> 0:1.4.12-1
 - Update to OpenAFS 1.4.12
 - OpenAFS has moved compile_et to afs_compile_et so that it


Index: sources
===================================================================
RCS file: /cvs/free/rpms/openafs/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Mar 2010 21:39:40 -0000	1.3
+++ sources	29 Jul 2010 18:35:55 -0000	1.4
@@ -1 +1,2 @@
-da23ef382ae95e1de1b3eda7e6696b53  openafs-1.4.12-src.tar.bz2
+23041583f982796da3965979537a4ef1  openafs-1.4.12.1-doc.tar.bz2
+c45a8ca3b4605e9dac25ff435c60d512  openafs-1.4.12.1-src.tar.bz2