[pam] - do not build some auxiliary tools that are not installed that require flex-static to build

Tomáš Mráz tmraz at fedoraproject.org
Mon Sep 20 10:16:37 UTC 2010


commit acc35880d3888a7ba971d1d5fcb74fbfafba77d2
Author: Tomas Mraz <tmraz at fedoraproject.org>
Date:   Mon Sep 20 12:16:26 2010 +0200

    - do not build some auxiliary tools that are not installed that require
      flex-static to build

 pam-1.1.2-noflex.patch |   27 +++++++++++++++++++++++++++
 pam.spec               |    6 +++++-
 2 files changed, 32 insertions(+), 1 deletions(-)
---
diff --git a/pam-1.1.2-noflex.patch b/pam-1.1.2-noflex.patch
new file mode 100644
index 0000000..fc96555
--- /dev/null
+++ b/pam-1.1.2-noflex.patch
@@ -0,0 +1,27 @@
+diff -up Linux-PAM-1.1.2/doc/Makefile.am.noflex Linux-PAM-1.1.2/doc/Makefile.am
+--- Linux-PAM-1.1.2/doc/Makefile.am.noflex	2008-02-04 16:05:51.000000000 +0100
++++ Linux-PAM-1.1.2/doc/Makefile.am	2010-09-20 10:40:59.000000000 +0200
+@@ -2,7 +2,7 @@
+ # Copyright (c) 2005, 2006 Thorsten Kukuk <kukuk at suse.de>
+ #
+ 
+-SUBDIRS = man specs sag adg mwg
++SUBDIRS = man sag adg mwg
+ 
+ CLEANFILES = *~
+ 
+diff -up Linux-PAM-1.1.2/Makefile.am.noflex Linux-PAM-1.1.2/Makefile.am
+--- Linux-PAM-1.1.2/Makefile.am.noflex	2010-07-08 14:04:19.000000000 +0200
++++ Linux-PAM-1.1.2/Makefile.am	2010-09-20 10:04:56.000000000 +0200
+@@ -5,9 +5,9 @@
+ AUTOMAKE_OPTIONS = 1.9 gnu dist-bzip2 check-news
+ 
+ if STATIC_MODULES
+-SUBDIRS = modules libpam libpamc libpam_misc tests po conf doc examples xtests
++SUBDIRS = modules libpam libpamc libpam_misc tests po doc examples xtests
+ else
+-SUBDIRS = libpam tests libpamc libpam_misc modules po conf doc examples xtests
++SUBDIRS = libpam tests libpamc libpam_misc modules po doc examples xtests
+ endif
+ 
+ CLEANFILES = *~
diff --git a/pam.spec b/pam.spec
index 61fd013..a52a66e 100644
--- a/pam.spec
+++ b/pam.spec
@@ -27,6 +27,7 @@ Patch4:  pam-1.1.0-console-nochmod.patch
 Patch5:  pam-1.1.0-notally.patch
 Patch7:  pam-1.1.0-console-fixes.patch
 Patch8:  pam-1.1.1-faillock.patch
+Patch9:  pam-1.1.2-noflex.patch
 
 %define _sbindir /sbin
 %define _moduledir /%{_lib}/security
@@ -93,6 +94,7 @@ mv pam-redhat-%{pam_redhat_version}/* modules
 %patch5 -p1 -b .notally
 %patch7 -p1 -b .console-fixes
 %patch8 -p1 -b .faillock
+%patch9 -p1 -b .noflex
 
 libtoolize -f
 autoreconf
@@ -337,9 +339,11 @@ fi
 %doc doc/adg/*.txt doc/adg/html
 
 %changelog
-* Fri Sep 17 2010 Tomas Mraz <tmraz at redhat.com> 1.1.2-1
+* Mon Sep 20 2010 Tomas Mraz <tmraz at redhat.com> 1.1.2-1
 - add pam_faillock module implementing temporary account lock out based
   on authentication failures during a specified interval
+- do not build some auxiliary tools that are not installed that require
+  flex-static to build
 - upgrade to new upstream release
 
 * Thu Jul 15 2010 Tomas Mraz <tmraz at redhat.com> 1.1.1-5


More information about the scm-commits mailing list