Ignore:
Timestamp:
Nov 22, 2011, 12:45:17 AM (13 years ago)
Author:
achernya
Message:
Merge branches/fc15-dev to trunk
Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/server/fedora/specs/openafs.spec.patch

    r1693 r2066  
    1 --- openafs.spec.orig   2010-09-10 18:21:53.000000000 -0400
    2 +++ openafs.spec        2010-09-10 18:34:30.000000000 -0400
    3 @@ -8,7 +8,7 @@
    4  # for beta/rc releases make pkgrel 0.X.<tag>
     1--- rpmbuild/SPECS/openafs.spec
     2+++ rpmbuild/SPECS/openafs.spec.~3~     2011-11-20 20:13:52.211673609 -0500
     3@@ -4,7 +4,7 @@
     4 %define pkgvers 1.6.0
     5 # for beta/rc releases make pkgrel 0.<tag>
    56 # for real releases make pkgrel 1 (or more for extra releases)
    6  #%define pkgrel 0.1.rc1
    7 -%define pkgrel 0.pre3
    8 +%define pkgrel 0.pre3.99scripts.%{scriptsversion}
     7-%define pkgrel 1
     8+%define pkgrel 1.99.scripts.%{scriptsversion}
    99 
    10  %if %{?osvers:0}%{!?osvers:1}
    11  %define osvers 1
    12 @@ -261,6 +261,10 @@
    13  %endif
     10 %{!?fedorakmod: %define fedorakmod 1}
     11 %{!?build_dkmspkg: %define build_dkmspkg 1}
     12@@ -237,6 +237,14 @@
     13 
    1414 ExclusiveArch: %{ix86} x86_64 ia64 s390 s390x sparc64 ppc ppc64
    1515 
    1616+Patch1000: openafs-scripts.patch
    17 +Patch1003: openafs-localcsdb.patch
    18 +Patch1005: openafs-numsysnames.patch
     17+Patch1001: openafs-localcsdb.patch
     18+Patch1002: openafs-systemd.patch
     19+Patch1003: openafs-systemd-crond.patch
     20+Patch1004: openafs-linux-3.1-rcu.patch
     21+Patch1005: openafs-linux-3.1-fsync.patch
     22+Patch1006: openafs-linux-3.1-zalloc.patch
    1923+
    2024 #    http://dl.openafs.org/dl/openafs/candidate/%{afsvers}/...
    2125 Source0: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-src.tar.bz2
    2226 Source1: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-doc.tar.bz2
    23 @@ -343,6 +347,7 @@
     27@@ -316,6 +324,7 @@
    2428 %if %{build_userspace}
    2529 
     
    2933 
    3034 %if %{fedorakmod}
    31 @@ -403,6 +408,7 @@
     35@@ -376,6 +385,7 @@
    3236 
    3337 %if %{build_authlibs}
     
    3741 Group: Networking/Filesystems
    3842 
    39 @@ -419,6 +425,7 @@
     43@@ -392,6 +402,7 @@
    4044 %endif
    4145 
     
    4347+Provides: scripts-openafs-authlibs-devel
    4448 %if %{build_authlibs}
    45  Requires: openafs-authlibs = %{version}
     49 Requires: openafs-authlibs = %{version}-%{release}
    4650 %endif
    47 @@ -437,6 +444,7 @@
     51@@ -410,6 +421,7 @@
    4852 libraries.
    4953 
     
    5256 Summary: OpenAFS Development Libraries and Headers
    5357 Group: Development/Filesystems
    54  
    55 @@ -465,6 +473,7 @@
     58 Requires: openafs = %{version}-%{release}
     59@@ -439,6 +451,7 @@
    5660 administrators.
    5761 
     
    6165 Group: Networking/Filesystems
    6266 Provides: openafs-kernel = %{version}
    63 @@ -514,6 +523,7 @@
     67@@ -488,6 +501,7 @@
    6468 
    6569 %if %{krb5support}
     
    6973 Requires: openafs = %{version}
    7074 Group: Networking/Filesystems
    71 @@ -540,7 +550,7 @@
     75@@ -514,7 +528,7 @@
    7276 %if %{build_modules}
    7377 
     
    7882 %else
    7983 
    80 @@ -699,6 +709,9 @@
     84@@ -671,6 +685,15 @@
     85 #%setup -q -n %{srcdir}
     86 %setup -q -b 1 -n %{srcdir}
    8187 
    82  # Patch openafs to build a kernel module named "openafs" instead of "libafs"
    83  %patch0 -p1 -b .kmod26
     88+# Apply the Scripts patch
    8489+%patch1000 -p1 -b .scripts
    85 +%patch1003 -p1 -b .localcsdb
    86 +%patch1005 -p1 -b .numsysnames
    87  
     90+%patch1001 -p1 -b .localcsdb
     91+%patch1002 -p1 -b .systemd
     92+%patch1003 -p1 -b .systemd-crond
     93+%patch1004 -p1 -b .rcu
     94+%patch1005 -p1 -b .fsync
     95+%patch1006 -p1 -b .zalloc
     96+
    8897 ##############################################################################
    8998 #
     99 # building
     100@@ -1212,6 +1235,13 @@
     101 rm -f $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so
     102 rm -f $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so.*
     103 rm -f $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so.*
     104+%else
     105+chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so
     106+chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so
     107+chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so.*
     108+chmod +x $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so.*
     109+chmod +x $RPM_BUILD_ROOT%{_libdir}/libkopenafs.so
     110+chmod +x $RPM_BUILD_ROOT%{_libdir}/libkopenafs.so.*
     111 %endif
     112 
     113 %endif
Note: See TracChangeset for help on using the changeset viewer.