Changeset 2591 for trunk/server/fedora/specs/openafs.spec.patch

Timestamp:

Aug 27, 2014, 10:06:17 PM (11 years ago)

Author:

achernya

Message:

Reintegrate fc20-dev into trunk

Location:

trunk

Files:

• . (modified) (1 prop)
• server/fedora/specs/openafs.spec.patch (modified) (7 diffs)

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

@@ -1 @@
---- openafs.spec.orig   2013-06-24 04:40:31.000000000 -0400
-+++ openafs.spec        2013-07-18 22:43:10.631044261 -0400
+--- openafs.spec.orig   2014-05-25 21:15:54.539027644 -0400
++++ openafs.spec        2014-05-25 21:16:27.836268275 -0400
 @@ -4,7 +4,7 @@
- %define pkgvers 1.6.4
+ %define pkgvers 1.6.8
  # for beta/rc releases make pkgrel 0.<tag>
  # for real releases make pkgrel 1 (or more for extra releases)
@@ -10 +10 @@
  %{!?fedorakmod: %define fedorakmod 1}
  %{!?build_dkmspkg: %define build_dkmspkg 1}
-@@ -249,9 +249,16 @@
+@@ -249,9 +249,15 @@
  %if %{build_modules}
  BuildRequires: kernel-devel
@@ -21 +21 @@
 +Patch1002: openafs-systemd-crond.patch
 +Patch1003: openafs-systemd-csdb.patch
-+Patch1004: openafs-d_drop.patch
 +%define _default_patch_fuzz 2
 +
@@ -33 +32 @@
 +Provides: scripts-openafs-client
  Requires: binutils, openafs = %{version}
- %if 0%{?fedora} >= 15
+ %if 0%{?fedora} >= 15 || 0%{?rhel} >= 7
  Requires: systemd-units
 @@ -382,6 +389,7 @@
@@ -92 +91 @@
  %else
  
-@@ -698,6 +711,12 @@
+@@ -698,6 +711,11 @@
  #%setup -q -n %{srcdir}
  %setup -q -b 1 -n %{srcdir}
@@ -100 +99 @@
 +%patch1002 -p1 -b .systemd-crond
 +%patch1003 -p1 -b .systemd-csdb
-+%patch1004 -p1 -b .d_drop
 +
  ##############################################################################
  #
  # building
-@@ -869,6 +887,8 @@
+@@ -871,6 +889,8 @@
  %endif
  %endif
@@ -114 +112 @@
         --prefix=%{_prefix} \
         --libdir=%{_libdir} \
-@@ -1257,6 +1277,13 @@
+@@ -1267,6 +1287,13 @@
  rm -f $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so
  rm -f $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so.*