[pam_kcoda] Fix patch to apply cleanly and fix FTBFS since F-12

Peter Robinson pbrobinson at fedoraproject.org
Sat Apr 21 13:49:29 UTC 2012


commit 271e8aaf0ed40c6d31df006768f467f506c881ea
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Sat Apr 21 14:49:18 2012 +0100

    Fix patch to apply cleanly and fix FTBFS since F-12

 pam_kcoda-Makefile.patch |    7 +++----
 pam_kcoda.spec           |   10 ++++------
 2 files changed, 7 insertions(+), 10 deletions(-)
---
diff --git a/pam_kcoda-Makefile.patch b/pam_kcoda-Makefile.patch
index c72cb75..2af8123 100644
--- a/pam_kcoda-Makefile.patch
+++ b/pam_kcoda-Makefile.patch
@@ -1,8 +1,7 @@
-diff -up pam_kcoda-v0.5.1/Makefile.orig pam_kcoda-v0.5.1/Makefile
---- pam_kcoda-v0.5.1/Makefile.orig	2008-10-01 11:54:03.000000000 -0400
-+++ pam_kcoda-v0.5.1/Makefile	2008-10-01 11:54:58.000000000 -0400
+--- pam_kcoda-v0.5.1/Makefile.orig	2008-10-01 16:33:05.000000000 +0100
++++ pam_kcoda-v0.5.1/Makefile	2012-04-21 14:46:17.027159162 +0100
 @@ -1,16 +1,16 @@
- # $Id: pam_kcoda-Makefile.patch,v 1.1 2008/10/13 12:34:36 nhorman Exp $
+ # $Id$
  
  CC=gcc
 -CFLAGS=-fPIC -O2 -Wall -Werror -pedantic
diff --git a/pam_kcoda.spec b/pam_kcoda.spec
index 4186a3e..8867977 100644
--- a/pam_kcoda.spec
+++ b/pam_kcoda.spec
@@ -2,7 +2,7 @@
 Summary: A Pluggable Authentication Module for coda using krb5 authentication
 Name: pam_kcoda
 Version: 0.5.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 URL: http://mir.dnsalias.com/_media/oss/pamcoda/
 Source0: http://mir.dnsalias.com/_media/oss/pamcoda/pam_kcoda-v%{version}.tgz
 Source1: pam_kcoda-license-README.txt
@@ -10,7 +10,6 @@ License: GPLv2+
 Group: System Environment/Base
 BuildRequires: pam-devel, e2fsprogs-devel, krb5-devel
 Requires: pam_krb5 coda-client
-BuildRoot: %{_tmppath}/%{name}-root
 
 Patch0: pam_kcoda-Makefile.patch
 
@@ -30,19 +29,18 @@ make
 strip pam_kcoda.so
 
 %install
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -fr $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/%{_lib}/security
 install -m 0755 pam_kcoda.so $RPM_BUILD_ROOT/%{_lib}/security
 
-%clean
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -fr $RPM_BUILD_ROOT
-
 %files
 %defattr(-,root,root)
 /%{_lib}/security/*
 %doc README AUTHORS COPYING
 
 %changelog
+* Sat Apr 21 2012 Peter Robinson <pbrobinson at fedoraproject.org> - 0.5.1-7
+- Fix patch to apply cleanly and fix FTBFS since F-12
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 


More information about the scm-commits mailing list