~ubuntu-branches/ubuntu/trusty/drbd8/trusty

« back to all changes in this revision

Viewing changes to rpm-macro-fixes/macros.rhel5.diff

  • Committer: Bazaar Package Importer
  • Author(s): Andres Rodriguez
  • Date: 2011-07-05 15:40:13 UTC
  • mfrom: (1.4.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20110705154013-f9l32owj6mi9e1p0
Tags: 2:8.3.11-0ubuntu1
* New upstream release
* debian/patches/01_ubuntu_cn_idx.dpatch: Refreshed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
--- /usr/lib/rpm/redhat/macros.orig
 
2
+++ /usr/lib/rpm/redhat/macros
 
3
@@ -170,8 +170,8 @@
 
4
 
 
5
 %kernel_module_package(n:v:r:s:f:xp:) %{expand:%( \
 
6
        %define kmodtool %{-s*}%{!-s:/usr/lib/rpm/redhat/kmodtool} \
 
7
-       %define kmp_version %{-v*}%{!-v:%{version}} \
 
8
-       %define kmp_release %{-r*}%{!-r:%{release}} \
 
9
+       %global kmp_version %{-v*}%{!-v:%{version}} \
 
10
+       %global kmp_release %{-r*}%{!-r:%{release}} \
 
11
        %define latest_kernel %(rpm -q --qf '%{VERSION}-%{RELEASE}\\\\n' `rpm -q kernel-devel | /usr/lib/rpm/redhat/rpmsort -r | head -n 1` | head -n 1) \
 
12
        %{!?kernel_version:%{expand:%%global kernel_version %{latest_kernel}}} \
 
13
        %global kverrel %(%{kmodtool} verrel %{?kernel_version} 2>/dev/null) \