rpms/aide/devel aide-0.11-no-static.patch, 1.2, 1.3 .cvsignore, 1.6, 1.7 aide.spec, 1.12, 1.13 sources, 1.6, 1.7 aide-0.10-no-static.patch, 1.1, NONE aide-useless-includes.patch, 1.3, NONE

Mon Sep 11 09:11:31 UTC 2006

Author: mschwendt

Update of /cvs/extras/rpms/aide/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1762/devel

Modified Files:
	.cvsignore aide.spec sources 
Added Files:
	aide-0.11-no-static.patch 
Removed Files:
	aide-0.10-no-static.patch aide-useless-includes.patch 
Log Message:
auto-import aide-0.11-2 on branch devel from aide-0.11-2.src.rpm

aide-0.11-no-static.patch:

Index: aide-0.11-no-static.patch
===================================================================
RCS file: aide-0.11-no-static.patch
diff -N aide-0.11-no-static.patch

--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ aide-0.11-no-static.patch	11 Sep 2006 09:11:31 -0000	1.3
@@ -0,0 +1,32 @@
+diff -Nur aide-0.11-orig/configure aide-0.11/configure
+--- aide-0.11-orig/configure	2006-02-18 13:49:06.000000000 +0100
++++ aide-0.11/configure	2006-02-19 21:05:57.000000000 +0100
+@@ -3485,8 +3485,8 @@
+     esac
+ fi
+ 
+-CFLAGS="$CFLAGS $LD_STATIC_FLAG"
+-CPPFLAGS="$CPPFLAGS $LD_STATIC_FLAG"
++#CFLAGS="$CFLAGS $LD_STATIC_FLAG"
++#CPPFLAGS="$CPPFLAGS $LD_STATIC_FLAG"
+ 
+ 
+ 
+@@ -8638,7 +8638,7 @@
+ done
+ 
+   save_LDFLAGS=$LDFLAGS
+-  LDFLAGS="$LDFLAGS $LD_STATIC_FLAG"
++  #LDFLAGS="$LDFLAGS $LD_STATIC_FLAG"
+ 
+ echo "$as_me:$LINENO: checking for gzdopen in -lz" >&5
+ echo $ECHO_N "checking for gzdopen in -lz... $ECHO_C" >&6
+@@ -10424,7 +10424,7 @@
+ s, at MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
+ s, at MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
+ s, at MAINT@,$MAINT,;t t
+-s, at LD_STATIC_FLAG@,$LD_STATIC_FLAG,;t t
++s, at LD_STATIC_FLAG@,,;t t
+ s, at CPP@,$CPP,;t t
+ s, at EGREP@,$EGREP,;t t
+ s, at AIDE_USE_LOCALE@,$AIDE_USE_LOCALE,;t t


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/aide/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	2 Mar 2006 12:22:25 -0000	1.6
+++ .cvsignore	11 Sep 2006 09:11:31 -0000	1.7
@@ -1 +1 @@
-aide-0.10.tar.gz
+aide-0.11.tar.gz


Index: aide.spec
===================================================================
RCS file: /cvs/extras/rpms/aide/devel/aide.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- aide.spec	3 Sep 2006 17:07:50 -0000	1.12
+++ aide.spec	11 Sep 2006 09:11:31 -0000	1.13
@@ -3,23 +3,20 @@
 
 Summary: Intrusion detection environment
 Name: aide
-Version: 0.10
-Release: 4%{?dist}
+Version: 0.11
+Release: 2%{?dist}
 URL: http://sourceforge.net/projects/aide
 License: GPL
 Group: Applications/System
-Source: http://download.sourceforge.net/aide/aide-0.10.tar.gz
+Source0: http://download.sourceforge.net/aide/aide-%{version}.tar.gz
 Source1: aide.conf
 Source2: README.quickstart
-Patch0: aide-0.10-no-static.patch
-Patch1: aide-useless-includes.patch
+Patch0: aide-0.11-no-static.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 Buildrequires: mhash-devel zlib-devel
 Buildrequires: flex bison
-# Red Hat bug #108655, bison requires m4
-Buildrequires: m4
-# Postgresql support doesn't build.
-Buildconflicts: postgresql-devel
+#Buildrequires: postgresql-devel libgcrypt-devel
+#(needs --with-psql and -lgcrypt in src/Makefile.in)
 
 %description
 AIDE (Advanced Intrusion Detection Environment) is a file integrity
@@ -27,17 +24,13 @@
 
 
 %prep
-%setup -q -n aide-0.10
+%setup -q
 %if 0%{nostatic}
 %patch0 -p1 -b .no-static
 %endif
-%patch1 -p1
 
-%build
-# Apply RPM_OPT_FLAGS.
-perl -pi -e 's/^CFLAGS="\$LD_STATIC_FLAG\"//' configure
-perl -pi -e 's/^CPPFLAGS="\$LD_STATIC_FLAG\"//' configure
 
+%build
 %configure --with-config_file=%{_sysconfdir}/aide.conf \
            --with-zlib \
            --with-mhash --enable-mhash
@@ -59,8 +52,7 @@
 mkdir -p -m0700 $RPM_BUILD_ROOT%{_localstatedir}/lib/aide
 install -p %{SOURCE2} README.quickstart
 mkdir -p -m0755 $RPM_BUILD_ROOT%{_mandir}/ru/man{1,5}
-install -p -m0644 doc/aide.1.ru $RPM_BUILD_ROOT%{_mandir}/ru/man1/aide.1
-install -p -m0644 doc/aide.conf.5.ru $RPM_BUILD_ROOT%{_mandir}/ru/man5/aide.conf.5
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -68,22 +60,23 @@
 
 %files
 %defattr(0644,root,root,0755)
-%doc AUTHORS COPYING ChangeLog NEWS README ./doc/manual.html
+%doc AUTHORS COPYING ChangeLog NEWS README doc/manual.html contrib/
 %doc README.quickstart
 %attr(0700,root,root) %{_sbindir}/aide
 %{_mandir}/man1/*
 %{_mandir}/man5/*
-%lang(ru) %{_mandir}/ru/man1/aide.1*
-%lang(ru) %{_mandir}/ru/man5/aide.conf.5*
 %config(noreplace) %attr(0600,root,root) %{_sysconfdir}/aide.conf
 %dir %attr(0700,root,root) %{_localstatedir}/lib/aide
 
 
 %changelog
-* Sun Sep 03 2006 Michael Schwendt <mschwendt[AT]users.sf.net>
+* Mon Sep 11 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.11-2
 - rebuilt
 
-* Thu Mar  2 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.10-3
+* Sun Feb 19 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.11-1
+- Update to 0.11 release.
+- useless-includes patch merged upstream.
+- old Russian man pages not available anymore.
 - disable static linking.
 
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/aide/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	2 Mar 2006 12:22:25 -0000	1.6
+++ sources	11 Sep 2006 09:11:31 -0000	1.7
@@ -1 +1 @@
-39eb7d21064cac7b409c45d038b86cd8  aide-0.10.tar.gz
+9a44e5386b0355ef57c60f627ff4d085  aide-0.11.tar.gz


--- aide-0.10-no-static.patch DELETED ---


--- aide-useless-includes.patch DELETED ---


