Changeset 2522 for branches/fc19-dev/server/fedora/specs

Timestamp:

May 25, 2014, 3:55:57 PM (10 years ago)

Author:

achernya

Message:

Merge r2487-r2521 from trunk to branches/fc19-dev

Location:

branches/fc19-dev

Files:

• . (modified) (1 prop)
• server/fedora/specs/gnutls.spec.patch (copied) (copied from trunk/server/fedora/specs/gnutls.spec.patch)
• server/fedora/specs/openafs.spec.patch (modified) (4 diffs)
• server/fedora/specs/rubygem-pony.spec (copied) (copied from trunk/server/fedora/specs/rubygem-pony.spec)

branches/fc19-dev/server/fedora/specs/openafs.spec.patch

@@ -10 +10 @@
  %{!?fedorakmod: %define fedorakmod 1}
  %{!?build_dkmspkg: %define build_dkmspkg 1}
-@@ -249,9 +249,15 @@
+@@ -249,9 +249,16 @@
  %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
 +
@@ -91 +92 @@
  %else
  
-@@ -698,6 +711,11 @@
+@@ -698,6 +711,12 @@
  #%setup -q -n %{srcdir}
  %setup -q -b 1 -n %{srcdir}
@@ -99 +100 @@
 +%patch1002 -p1 -b .systemd-crond
 +%patch1003 -p1 -b .systemd-csdb
++%patch1004 -p1 -b .d_drop
 +
  ##############################################################################