--- openafs.spec.orig 2011-06-20 15:32:57.000000000 -0400 +++ openafs.spec 2011-06-21 17:15:24.000000000 -0400 @@ -4,7 +4,7 @@ %define pkgvers 1.6.0 # for beta/rc releases make pkgrel 0. # for real releases make pkgrel 1 (or more for extra releases) -%define pkgrel 1 +%define pkgrel 1.99.scripts.%{scriptsversion} %{!?fedorakmod: %define fedorakmod 1} %{!?build_dkmspkg: %define build_dkmspkg 1} @@ -247,6 +247,11 @@ %endif ExclusiveArch: %{ix86} x86_64 ia64 s390 s390x sparc64 ppc ppc64 +Patch1000: openafs-scripts.patch +Patch1001: openafs-localcsdb.patch +Patch1002: openafs-systemd.patch +Patch1003: openafs-systemd-crond.patch + # http://dl.openafs.org/dl/openafs/candidate/%{afsvers}/... Source0: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-src.tar.bz2 Source1: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-doc.tar.bz2 @@ -326,6 +329,7 @@ %if %{build_userspace} %package client +Provides: scripts-openafs-client Requires: binutils, openafs = %{version} %if %{fedorakmod} @@ -386,6 +390,7 @@ %if %{build_authlibs} %package authlibs +Provides: scripts-openafs-authlibs Summary: OpenAFS authentication shared libraries Group: Networking/Filesystems @@ -402,6 +407,7 @@ %endif %package authlibs-devel +Provides: scripts-openafs-authlibs-devel %if %{build_authlibs} Requires: openafs-authlibs = %{version} %endif @@ -420,6 +426,7 @@ libraries. %package devel +Provides: scripts-openafs-devel Summary: OpenAFS Development Libraries and Headers Group: Development/Filesystems @@ -448,6 +455,7 @@ administrators. %package kernel-source +Provides: scripts-openafs-kernel-source Summary: OpenAFS Kernel Module source tree Group: Networking/Filesystems Provides: openafs-kernel = %{version} @@ -497,6 +505,7 @@ %if %{krb5support} %package krb5 +Provides: scripts-openafs-krb5 Summary: OpenAFS programs to use with krb5 Requires: openafs = %{version} Group: Networking/Filesystems @@ -523,7 +532,7 @@ %if %{build_modules} %if %{fedorakmod} -%{expand:%(%{kmodtool} rpmtemplate %{kmod_name} %{kverrel} %{kvariants} 2>/dev/null)} +%{expand:%(%{kmodtool} rpmtemplate %{kmod_name} %{kverrel} %{kvariants} | sed '/^%package/ aProvides: scripts-kmod-openafs' 2>/dev/null)} %else @@ -680,6 +689,12 @@ #%setup -q -n %{srcdir} %setup -q -b 1 -n %{srcdir} +# Apply the Scripts patch +%patch1000 -p1 -b .scripts +%patch1001 -p1 -b .localcsdb +%patch1002 -p1 -b .systemd +%patch1003 -p1 -b .systemd-crond + ############################################################################## # # building @@ -1215,6 +1230,13 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so rm -f $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so.* rm -f $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so.* +%else +chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so +chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so +chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so.* +chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so.* +chmod +x $RPM_BUILD_ROOT%{_libdir}/libkopenafs.so +chmod +x $RPM_BUILD_ROOT%{_libdir}/libkopenafs.so.* %endif %endif