[prelude-manager/f15/master] new upstream version

Steve Grubb sgrubb at fedoraproject.org
Thu Mar 24 18:21:37 UTC 2011


commit 1ed45d35fa29b33b92fd1859872547e123c6da57
Author: Steve <sgrubb at redhat.com>
Date:   Thu Mar 24 14:21:25 2011 -0400

    new upstream version

 prelude-manager-0.9.12-pie.patch                   |   55 --------------------
 ...15-pie.patch => prelude-manager-1.0.1-pie.patch |   50 +++++++++---------
 prelude-manager.spec                               |    9 ++-
 sources                                            |    2 +-
 4 files changed, 32 insertions(+), 84 deletions(-)
---
diff --git a/prelude-manager-0.9.15-pie.patch b/prelude-manager-1.0.1-pie.patch
similarity index 52%
rename from prelude-manager-0.9.15-pie.patch
rename to prelude-manager-1.0.1-pie.patch
index ba1db6e..831acff 100644
--- a/prelude-manager-0.9.15-pie.patch
+++ b/prelude-manager-1.0.1-pie.patch
@@ -1,7 +1,7 @@
-diff -ur prelude-manager-0.9.15.orig/configure prelude-manager-0.9.15/configure
---- prelude-manager-0.9.15.orig/configure	2009-07-10 09:05:32.000000000 -0400
-+++ prelude-manager-0.9.15/configure	2009-07-10 09:16:47.000000000 -0400
-@@ -41642,6 +41642,8 @@
+diff -ur prelude-manager-1.0.1.orig/configure prelude-manager-1.0.1/configure
+--- prelude-manager-1.0.1.orig/configure	2011-03-24 14:06:38.000000000 -0400
++++ prelude-manager-1.0.1/configure	2011-03-24 14:08:00.000000000 -0400
+@@ -31131,6 +31131,8 @@
  
      :
      LDFLAGS="$LDFLAGS -z now"
@@ -10,18 +10,18 @@ diff -ur prelude-manager-0.9.15.orig/configure prelude-manager-0.9.15/configure
  
  else
  
-diff -ur prelude-manager-0.9.15.orig/configure.in prelude-manager-0.9.15/configure.in
---- prelude-manager-0.9.15.orig/configure.in	2009-07-10 09:05:32.000000000 -0400
-+++ prelude-manager-0.9.15/configure.in	2009-07-10 09:16:21.000000000 -0400
-@@ -249,6 +249,7 @@
- 
+diff -ur prelude-manager-1.0.1.orig/configure.in prelude-manager-1.0.1/configure.in
+--- prelude-manager-1.0.1.orig/configure.in	2011-03-24 14:06:38.000000000 -0400
++++ prelude-manager-1.0.1/configure.in	2011-03-24 14:08:00.000000000 -0400
+@@ -250,6 +250,7 @@
+ AC_PROG_CXX
  AX_LD_CHECK_FLAG(-z relro, , , LDFLAGS="$LDFLAGS -z relro")
  AX_LD_CHECK_FLAG(-z now, , , LDFLAGS="$LDFLAGS -z now")
 +AX_C_CHECK_FLAG(-fPIE -DPIE, , , PRELUDE_MANAGER_CFLAGS="$PRELUDE_MANAGER_CFLAGS -fPIE -DPIE"; PRELUDE_MANAGER_LDFLAGS="-pie"; AR_FLAGS="$AR_FLAGS -fPIC")
  
  for i in -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations \
           -Wbad-function-cast -Wcast-qual -Wcast-align -Wnested-externs -Wunused \
-@@ -305,6 +306,7 @@
+@@ -306,6 +307,7 @@
  AC_SUBST(LDFLAGS)
  AC_SUBST(GLOBAL_CFLAGS)
  AC_SUBST(PRELUDE_MANAGER_CFLAGS)
@@ -29,19 +29,19 @@ diff -ur prelude-manager-0.9.15.orig/configure.in prelude-manager-0.9.15/configu
  
  AC_CONFIG_FILES([
  
-diff -ur prelude-manager-0.9.15.orig/libev/Makefile.am prelude-manager-0.9.15/libev/Makefile.am
---- prelude-manager-0.9.15.orig/libev/Makefile.am	2009-07-10 09:05:32.000000000 -0400
-+++ prelude-manager-0.9.15/libev/Makefile.am	2009-07-10 09:19:16.000000000 -0400
+diff -ur prelude-manager-1.0.1.orig/libev/Makefile.am prelude-manager-1.0.1/libev/Makefile.am
+--- prelude-manager-1.0.1.orig/libev/Makefile.am	2011-03-24 14:06:38.000000000 -0400
++++ prelude-manager-1.0.1/libev/Makefile.am	2011-03-24 14:08:00.000000000 -0400
 @@ -1,4 +1,5 @@
  EXTRA_DIST=LICENSE Changes README ev_epoll.c ev_kqueue.c ev_poll.c ev_port.c ev_select.c ev_win32.c
 +AM_CFLAGS = -fPIC -DPIC
  noinst_HEADERS = ev.h ev_vars.h ev_wrap.h
  noinst_LTLIBRARIES = libev.la
  libev_la_SOURCES = ev.c
-diff -ur prelude-manager-0.9.15.orig/libev/Makefile.in prelude-manager-0.9.15/libev/Makefile.in
---- prelude-manager-0.9.15.orig/libev/Makefile.in	2009-07-10 09:05:32.000000000 -0400
-+++ prelude-manager-0.9.15/libev/Makefile.in	2009-07-10 09:18:17.000000000 -0400
-@@ -161,7 +161,7 @@
+diff -ur prelude-manager-1.0.1.orig/libev/Makefile.in prelude-manager-1.0.1/libev/Makefile.in
+--- prelude-manager-1.0.1.orig/libev/Makefile.in	2011-03-24 14:06:38.000000000 -0400
++++ prelude-manager-1.0.1/libev/Makefile.in	2011-03-24 14:08:00.000000000 -0400
+@@ -180,7 +180,7 @@
  BITSIZEOF_WINT_T = @BITSIZEOF_WINT_T@
  CC = @CC@
  CCDEPMODE = @CCDEPMODE@
@@ -50,10 +50,10 @@ diff -ur prelude-manager-0.9.15.orig/libev/Makefile.in prelude-manager-0.9.15/li
  CPP = @CPP@
  CPPFLAGS = @CPPFLAGS@
  CXX = @CXX@
-diff -ur prelude-manager-0.9.15.orig/src/Makefile.am prelude-manager-0.9.15/src/Makefile.am
---- prelude-manager-0.9.15.orig/src/Makefile.am	2009-07-10 09:05:32.000000000 -0400
-+++ prelude-manager-0.9.15/src/Makefile.am	2009-07-10 09:17:17.000000000 -0400
-@@ -28,7 +28,7 @@
+diff -ur prelude-manager-1.0.1.orig/src/Makefile.am prelude-manager-1.0.1/src/Makefile.am
+--- prelude-manager-1.0.1.orig/src/Makefile.am	2011-03-24 14:06:38.000000000 -0400
++++ prelude-manager-1.0.1/src/Makefile.am	2011-03-24 14:08:00.000000000 -0400
+@@ -36,7 +36,7 @@
          -dlopen $(top_builddir)/plugins/reports/relaying/relaying.la \
          -dlopen $(top_builddir)/plugins/reports/smtp/smtp.la \
          -dlopen $(top_builddir)/plugins/reports/textmod/textmod.la \
@@ -62,10 +62,10 @@ diff -ur prelude-manager-0.9.15.orig/src/Makefile.am prelude-manager-0.9.15/src/
  
  prelude_manager_SOURCES = \
  	bufpool.c	  \
-diff -ur prelude-manager-0.9.15.orig/src/Makefile.in prelude-manager-0.9.15/src/Makefile.in
---- prelude-manager-0.9.15.orig/src/Makefile.in	2009-07-10 09:05:32.000000000 -0400
-+++ prelude-manager-0.9.15/src/Makefile.in	2009-07-10 09:17:05.000000000 -0400
-@@ -719,7 +719,7 @@
+diff -ur prelude-manager-1.0.1.orig/src/Makefile.in prelude-manager-1.0.1/src/Makefile.in
+--- prelude-manager-1.0.1.orig/src/Makefile.in	2011-03-24 14:06:38.000000000 -0400
++++ prelude-manager-1.0.1/src/Makefile.in	2011-03-24 14:08:00.000000000 -0400
+@@ -944,7 +944,7 @@
          -dlopen $(top_builddir)/plugins/reports/relaying/relaying.la \
          -dlopen $(top_builddir)/plugins/reports/smtp/smtp.la \
          -dlopen $(top_builddir)/plugins/reports/textmod/textmod.la \
diff --git a/prelude-manager.spec b/prelude-manager.spec
index 003bf62..be126db 100644
--- a/prelude-manager.spec
+++ b/prelude-manager.spec
@@ -1,7 +1,7 @@
 Name:		prelude-manager
 Epoch:		1
-Version:	1.0.0
-Release:	4%{?dist}
+Version:	1.0.1
+Release:	1%{?dist}
 Summary:	Prelude-Manager
 
 Group:		Applications/Internet
@@ -9,7 +9,7 @@ License:	GPLv2+
 URL:		http://www.prelude-ids.org
 Source0:	http://www.prelude-ids.org/download/releases/%{name}/%{name}-%{version}.tar.gz
 Source1:	%{name}.init
-Patch1:		%{name}-0.9.15-pie.patch
+Patch1:		%{name}-1.0.1-pie.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libpreludedb-devel, libxml2-devel
@@ -155,6 +155,9 @@ fi
 
 
 %changelog
+* Thu Mar 24 2011 Steve Grubb <sgrubb at redhat.com> 1.0.1-1
+- new upstream version
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.0.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 1a6b7ac..c4eb019 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d9236471bc7c0d420755249680261d18  prelude-manager-1.0.0.tar.gz
+9018383b6008528ccdc85523c8b3f3ed  prelude-manager-1.0.1.tar.gz


More information about the scm-commits mailing list