rpms/pads/devel pads-1.2-pthreads.patch,NONE,1.1 pads.spec,1.2,1.3

[Steve Grubb]

Author: sgrubb

Update of /cvs/pkgs/rpms/pads/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4956

Modified Files:
	pads.spec 
Added Files:
	pads-1.2-pthreads.patch 
Log Message:
* Tue Oct 28 2008 Steve Grubb <sgrubb at redhat.com> 1.2-2
- Update CFLAGS for newer libprelude


pads-1.2-pthreads.patch:

--- NEW FILE pads-1.2-pthreads.patch ---
diff -ur pads-1.2.orig/lib/bstring/Makefile.am pads-1.2/lib/bstring/Makefile.am
--- pads-1.2.orig/lib/bstring/Makefile.am	2008-10-26 09:54:10.000000000 -0400
+++ pads-1.2/lib/bstring/Makefile.am	2008-10-28 09:40:50.000000000 -0400
@@ -1,5 +1,6 @@
 # $Id: Makefile.am,v 1.1 2005/02/13 17:54:58 mattshelton Exp $
 AUTOMAKE_OPTIONS=foreign no-dependencies
 noinst_LIBRARIES = libbstring.a
+libbstring_a_CFLAGS = -pthread
 libbstring_a_SOURCES = bstrlib.c bstrlib.h bstraux.c bstraux.h util.c util.h
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
diff -ur pads-1.2.orig/src/Makefile.am pads-1.2/src/Makefile.am
--- pads-1.2.orig/src/Makefile.am	2008-10-26 09:54:10.000000000 -0400
+++ pads-1.2/src/Makefile.am	2008-10-28 09:41:43.000000000 -0400
@@ -1,6 +1,7 @@
 ## $Id: Makefile.am,v 1.3 2005/02/17 16:29:54 mattshelton Exp $
 AUTOMAKE_OPTIONS=foreign no-dependencies
 bin_PROGRAMS = pads
+pads_CFLAGS = -pthread
 pads_SOURCES = pads.c pads.h \
 	       storage.c storage.h \
                identification.c identification.h \
@@ -10,6 +11,7 @@
 	       configuration.c configuration.h \
                util.c util.h \
                global.h
+pads_LDFLAGS = -pthread
 pads_LDADD = $(top_srcdir)/lib/bstring/libbstring.a output/liboutput.a
 bin_SCRIPTS = pads-report
 
diff -ur pads-1.2.orig/src/output/Makefile.am pads-1.2/src/output/Makefile.am
--- pads-1.2.orig/src/output/Makefile.am	2008-10-26 09:54:10.000000000 -0400
+++ pads-1.2/src/output/Makefile.am	2008-10-28 09:40:50.000000000 -0400
@@ -1,6 +1,7 @@
 # $Id: Makefile.am,v 1.1 2005/02/10 06:05:06 mattshelton Exp $
 AUTOMAKE_OPTIONS=foreign no-dependencies
 noinst_LIBRARIES = liboutput.a
+liboutput_a_CFLAGS = -pthread
 liboutput_a_SOURCES = output.c output.h \
 		      output-screen.c output-screen.h \
                       output-csv.c output-csv.h \


Index: pads.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pads/devel/pads.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pads.spec	13 Aug 2008 21:53:42 -0000	1.2
+++ pads.spec	28 Oct 2008 13:49:27 -0000	1.3
@@ -1,7 +1,7 @@
 %define _default_patch_fuzz 2
 Name: pads
 Version: 1.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Passive Asset Detection System
 Group: Applications/System
 License: GPLv2+
@@ -25,10 +25,11 @@
 Patch14: pads-1.2-leak.patch
 Patch15: pads-1.2-perf.patch
 Patch16: pads-1.2-daemon.patch
+Patch17: pads-1.2-pthreads.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: automake autoconf
 BuildRequires: pcre-devel libpcap-devel
-BuildRequires: libprelude-devel
+BuildRequires: libprelude-devel >= 0.9.21
 Requires(post)  : /sbin/chkconfig
 Requires(preun) : /sbin/chkconfig
 Requires(preun) : /sbin/service
@@ -58,6 +59,7 @@
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
+%patch17 -p1
 
 %build
 autoreconf -fv --install
@@ -104,5 +106,8 @@
 %{_mandir}/*/*
 
 %changelog
+* Tue Oct 28 2008 Steve Grubb <sgrubb at redhat.com> 1.2-2
+- Update CFLAGS for newer libprelude
+
 * Tue Aug 12 2008 Steve Grubb <sgrubb at redhat.com> 1.2-1
  Initial rpm build with many bug fixes