DEVEL15-redhat-build-updates-20080701

LICENSE IPL10
FIXES 105231

update specfile for new manpages.
update patch for 1.5.x/head
update makesrpm to quote some arguments to system so perl doesn't eat them

some rewriting from shadow@dementia.org including the patch update

(cherry picked from commit 0d343077ac1ca8bd35921de2a2b19cac4eb75496)

diff --git a/src/packaging/RedHat/makesrpm.pl b/src/packaging/RedHat/makesrpm.pl
index 406d7d0853b8184fea656b385b8e7a3fcf9e7e32..4b3601c14dd93c91317bc0a50acb01ee426512c6 100755 (executable)
--- a/src/packaging/RedHat/makesrpm.pl
+++ b/src/packaging/RedHat/makesrpm.pl
@@ -29,8 +29,8 @@ if (! -f $srcball) {
 
 my $tmpdir = File::Temp::tempdir(CLEANUP => 1);
 
-system("tar -C $tmpdir -xvjf $srcball \*/configure.in ".
-       "\*/src/packaging/RedHat > /dev/null")==0
+system("tar -C $tmpdir -xvjf $srcball '\*/configure.in' ".
+       "'\*/src/packaging/RedHat' > /dev/null")==0
   or die "Unable to unpack src tar ball\n";
 
 my $dirh = IO::Dir->new($tmpdir);

diff --git a/src/packaging/RedHat/openafs-1.4.0-kmodule26.patch b/src/packaging/RedHat/openafs-1.4.0-kmodule26.patch
index 6b92b8d587976628c319cda8c4743200975d2439..78d9e1519fd86dde6b5cc5ba60436f24a7e55f85 100644 (file)
--- a/src/packaging/RedHat/openafs-1.4.0-kmodule26.patch
+++ b/src/packaging/RedHat/openafs-1.4.0-kmodule26.patch
@@ -1,6 +1,6 @@
 --- openafs-1.4.0-rc4/src/libafs/MakefileProto.LINUX.in-orig   2005-07-25 14:32:15.000000000 -0400
 +++ openafs-1.4.0-rc4/src/libafs/MakefileProto.LINUX.in        2005-09-23 16:45:44.000000000 -0400
-@@ -245,11 +245,11 @@
+@@ -280,11 +280,11 @@
        echo BM Build Complete
  
  <linux26 linux_26 umlinux26>
@@ -10,8 +10,8 @@
 +      cp openafs.ko $@
  
  .FORCE:
--libafs.ko: .FORCE
-+openafs.ko: .FORCE
-       env EXTRA_CFLAGS="${EXTRA_CFLAGS}" @TOP_SRCDIR@/libafs/make_kbuild_makefile.pl ${KDIR} $@ @TOP_OBJDIR@/src/config/Makefile.config Makefile.afs Makefile.common
+-libafs.ko afspag.ko: .FORCE
++openafs.ko afspag.ko: .FORCE
+       env EXTRA_CFLAGS="${EXTRA_CFLAGS}" @TOP_SRCDIR@/libafs/make_kbuild_makefile.pl ${KDIR} @TOP_OBJDIR@/src/config/Makefile.config Makefile.afs Makefile.common
        env EXTRA_CFLAGS="${EXTRA_CFLAGS}" $(MAKE) -C ${LINUX_KERNEL_PATH} M=@TOP_OBJDIR@/src/libafs/${KDIR} modules
          

diff --git a/src/packaging/RedHat/openafs.spec.in b/src/packaging/RedHat/openafs.spec.in
index ca36342a6b8b6150bce604204b440765334c72ac..e046702152a73827c129f7e9b1f2458d9407ddf5 100644 (file)
--- a/src/packaging/RedHat/openafs.spec.in
+++ b/src/packaging/RedHat/openafs.spec.in
@@ -1494,11 +1494,11 @@ dkms remove -m %{namee} -v %{dkms_version} --rpm_safe_upgrade --all ||:
 %{_mandir}/man8/upclient.*
 %{_mandir}/man8/upserver.*
 %{_mandir}/man8/vldb_check.*
+%{_mandir}/man8/vldb_convert.*
 %{_mandir}/man8/vlserver.*
 %{_mandir}/man8/voldump.*
 %{_mandir}/man8/volinfo.*
 %{_mandir}/man8/volserver.*
-#%{_mandir}/man8/vldb_convert.*
 
 %if %{build_authlibs}
 %files authlibs
@@ -1568,6 +1568,7 @@ dkms remove -m %{namee} -v %{dkms_version} --rpm_safe_upgrade --all ||:
 %files krb5
 %defattr(-,root,root)
 %{_bindir}/aklog
+%{_bindir}/klog.krb5
 %{_sbindir}/asetkey
 %{_mandir}/man1/aklog.*
 %{_mandir}/man8/asetkey.*