[pam_smb] - Merge-review cleanup (#226227)

paragn paragn at fedoraproject.org
Wed Sep 8 04:54:21 UTC 2010


commit 8daa98d52c27592c6f1d77d91e8aa3c2a5199e3d
Author: paragn <paragn at fedoraproject.org>
Date:   Wed Sep 8 10:27:55 2010 +0530

    - Merge-review cleanup (#226227)

 pam_smb.spec |   16 +++++++---------
 1 files changed, 7 insertions(+), 9 deletions(-)
---
diff --git a/pam_smb.spec b/pam_smb.spec
index fbcd627..6589730 100644
--- a/pam_smb.spec
+++ b/pam_smb.spec
@@ -1,6 +1,6 @@
 Name: pam_smb
 Version: 1.1.7
-Release: 11%{?dist}
+Release: 12%{?dist}
 Summary: A Pluggable Authentication Module (PAM) for use with SMB servers.
 Group: System Environment/Base
 URL: http://www.csn.ul.ie/~airlied/pam_smb/
@@ -9,7 +9,6 @@ Source: ftp://ftp.samba.org/pub/samba/pam_smb/pam_smb-%{version}.tar.gz
 Source1: pam_smb.conf
 Patch0: pam_smb-1.1.7-grubb.patch
 Patch1: pam_smb-1.1.7-stray_quote.patch
-BuildRoot: %{_tmppath}/%{name}-root
 BuildRequires: autoconf213, pam-devel
 
 %description
@@ -18,7 +17,7 @@ SMB server.
 
 %prep
 %setup -q -n %{name}
-cp %{SOURCE1} .
+cp -p %{SOURCE1} .
 %patch0 -p1 -b .grubb
 %patch1 -p1 -b .stray_quote
 
@@ -28,13 +27,9 @@ autoconf-2.13
 make %{?_smp_mflags}
 
 %install
-rm -fr $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/%{_lib}/security $RPM_BUILD_ROOT%{_sysconfdir}
-install -m755 pam_smb_auth.so $RPM_BUILD_ROOT/%{_lib}/security/
-install -m644 pam_smb.conf $RPM_BUILD_ROOT%{_sysconfdir}
-
-%clean
-rm -fr $RPM_BUILD_ROOT
+install -p -m755 pam_smb_auth.so $RPM_BUILD_ROOT/%{_lib}/security/
+install -p -m644 pam_smb.conf $RPM_BUILD_ROOT%{_sysconfdir}
 
 %files
 %defattr(-,root,root,-)
@@ -43,6 +38,9 @@ rm -fr $RPM_BUILD_ROOT
 /%{_lib}/security/pam_smb_auth.so
 
 %changelog
+* Wed Sep 08 2010 Parag Nemade <paragn AT fedoraproject.org> - 1.1.7-12
+- Merge-review cleanup (#226227)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.7-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


More information about the scm-commits mailing list