source: trunk/server/fedora/specs/openafs.spec.patch @ 2335

Last change on this file since 2335 was 2335, checked in by geofft, 12 years ago
Create patch for current openafs-stable-1_6_x as fake 1.6.1.1 Create a single large patch containing the diff between the 1.6.1 release and a new openafs-stable_1_6_1_1-branch, which was made from a rebase of openafs-stable-1_6_x onto openafs-stable-1_6_1-branch. We continue to revert the things reverted in 1.6.1, including "offline-less vos release". This patch supersedes three of the patches we previously cherry-picked. This allows us to compile on Linux 3.6. In order to make this work, we run ./regen.sh (= autoreconf) in the build process. Consider removing this once we get back to closely tracking an actual OpenAFS release. The actual git branch is in openafs-stable-1_6_1_1-branch on https://github.com/sipb/openafs (also in w-e:/home/scripts-build/openafs).
File size: 3.5 KB

  • openafs.spec

    old new  
    11# Openafs Spec $Revision$
    22
    33%define afsvers 1.6.1
    4 %define pkgvers 1.6.1
     4%define pkgvers 1.6.1.1
    55# for beta/rc releases make pkgrel 0.<tag>
    66# for real releases make pkgrel 1 (or more for extra releases)
    7 %define pkgrel 1
     7%define pkgrel 1.99.scripts.%{scriptsversion}
    88
    99%{!?fedorakmod: %define fedorakmod 1}
    1010%{!?build_dkmspkg: %define build_dkmspkg 1}
    … …  
    249249%if %{build_modules}
    250250BuildRequires: kernel-devel
    251251%endif
     252BuildRequires: libtool
    252253
    253254ExclusiveArch: %{ix86} x86_64 ia64 s390 s390x sparc64 ppc ppc64
    254255
     256Patch999:  openafs-stable-1.6.1.1.patch
     257Patch1000: openafs-scripts.patch
     258Patch1001: openafs-systemd-crond.patch
     259Patch1002: openafs-systemd-csdb.patch
     260%define _default_patch_fuzz 2
     261
    255262#    http://dl.openafs.org/dl/openafs/candidate/%{afsvers}/...
    256263Source0: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-src.tar.bz2
    257264Source1: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-doc.tar.bz2
    … …  
    331338%if %{build_userspace}
    332339
    333340%package client
     341Provides: scripts-openafs-client
    334342Requires: binutils, openafs = %{version}
    335343%if 0%{?fedora} >= 15
    336344Requires: systemd-units
    … …  
    403411
    404412%if %{build_authlibs}
    405413%package authlibs
     414Provides: scripts-openafs-authlibs
    406415Summary: OpenAFS authentication shared libraries
    407416Group: Networking/Filesystems
    408417
    … …  
    419428%endif
    420429
    421430%package authlibs-devel
     431Provides: scripts-openafs-authlibs-devel
    422432%if %{build_authlibs}
    423433Requires: openafs-authlibs = %{version}-%{release}
    424434%endif
    … …  
    437447libraries.
    438448
    439449%package devel
     450Provides: scripts-openafs-devel
    440451Summary: OpenAFS Development Libraries and Headers
    441452Group: Development/Filesystems
    442453Requires: openafs = %{version}-%{release}
    … …  
    466477administrators.
    467478
    468479%package kernel-source
     480Provides: scripts-openafs-kernel-source
    469481Summary: OpenAFS Kernel Module source tree
    470482Group: Networking/Filesystems
    471483Provides: openafs-kernel = %{version}
    … …  
    515527
    516528%if %{krb5support}
    517529%package krb5
     530Provides: scripts-openafs-krb5
    518531Summary: OpenAFS programs to use with krb5
    519532Requires: openafs = %{version}
    520533Group: Networking/Filesystems
    … …  
    541554%if %{build_modules}
    542555
    543556%if %{fedorakmod}
    544 %{expand:%(%{kmodtool} rpmtemplate %{kmod_name} %{kverrel} %{kvariants} 2>/dev/null)}
     557%{expand:%(%{kmodtool} rpmtemplate %{kmod_name} %{kverrel} %{kvariants} | sed '/^%package/ aProvides: scripts-kmod-openafs' 2>/dev/null)}
    545558
    546559%else
    547560
    … …  
    698711#%setup -q -n %{srcdir}
    699712%setup -q -b 1 -n %{srcdir}
    700713
     714# Apply the Scripts patch
     715%patch999  -p1 -b .1.6.1.1
     716%patch1000 -p1 -b .scripts
     717%patch1001 -p1 -b .systemd-crond
     718%patch1002 -p1 -b .systemd-csdb
     719
    701720##############################################################################
    702721#
    703722# building
    … …  
    869888%endif
    870889%endif
    871890
     891./regen.sh
     892
    872893./configure --with-afs-sysname=${sysname} \
    873894       --prefix=%{_prefix} \
    874895       --libdir=%{_libdir} \
    … …  
    12781299rm -f $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so
    12791300rm -f $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so.*
    12801301rm -f $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so.*
     1302%else
     1303chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so
     1304chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so
     1305chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so.*
     1306chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so.*
     1307chmod +x $RPM_BUILD_ROOT%{_libdir}/libkopenafs.so
     1308chmod +x $RPM_BUILD_ROOT%{_libdir}/libkopenafs.so.*
    12811309%endif
    12821310
    12831311%endif
Note: See TracBrowser for help on using the repository browser.