rpms/aide/FC-4 aide-0.10-no-static.patch, NONE, 1.1 aide.spec, 1.7, 1.8

Michael Schwendt (mschwendt) fedora-extras-commits at redhat.com
Thu Mar 2 11:34:16 UTC 2006


Author: mschwendt

Update of /cvs/extras/rpms/aide/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3305

Modified Files:
	aide.spec 
Added Files:
	aide-0.10-no-static.patch 
Log Message:
sync with no-static change in devel, but only commit this to test-build this old version with devel flex

aide-0.10-no-static.patch:

--- NEW FILE aide-0.10-no-static.patch ---
diff -Nur aide-0.10-orig/configure aide-0.10/configure
--- aide-0.10-orig/configure	2003-11-28 16:14:08.000000000 +0100
+++ aide-0.10/configure	2006-03-02 12:30:37.000000000 +0100
@@ -1720,8 +1720,8 @@
     esac
 fi
 
-CFLAGS="$CFLAGS $LD_STATIC_FLAG"
-CPPFLAGS="$CPPFLAGS $LD_STATIC_FLAG"
+#CFLAGS="$CFLAGS $LD_STATIC_FLAG"
+#CPPFLAGS="$CPPFLAGS $LD_STATIC_FLAG"
 
 
 
@@ -3022,7 +3022,7 @@
 done
 
   save_LDFLAGS=$LDFLAGS
-  LDFLAGS="$LDFLAGS $LD_STATIC_FLAG"
+  #LDFLAGS="$LDFLAGS $LD_STATIC_FLAG"
   echo $ac_n "checking for gzdopen in -lz""... $ac_c" 1>&6
 echo "configure:3028: checking for gzdopen in -lz" >&5
 ac_lib_var=`echo z'_'gzdopen | sed 'y%./+-%__p_%'`
@@ -3798,7 +3798,7 @@
 s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g
 s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
 s%@MAINT@%$MAINT%g
-s%@LD_STATIC_FLAG@%$LD_STATIC_FLAG%g
+s%@LD_STATIC_FLAG@%%g
 s%@AIDE_USE_LOCALE@%$AIDE_USE_LOCALE%g
 s%@ACLLIB@%$ACLLIB%g
 s%@CRYPTLIB@%$CRYPTLIB%g


Index: aide.spec
===================================================================
RCS file: /cvs/extras/rpms/aide/FC-4/aide.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- aide.spec	6 Apr 2005 22:10:48 -0000	1.7
+++ aide.spec	2 Mar 2006 11:34:15 -0000	1.8
@@ -1,14 +1,17 @@
+%{?_with_static: %define nostatic 0}
+%{!?_with_static: %define nostatic 1}
+
 Summary: Intrusion detection environment
 Name: aide
 Version: 0.10
-Release: 2
-
+Release: 3
 URL: http://sourceforge.net/projects/aide
 License: GPL
 Group: Applications/System
 Source: http://download.sourceforge.net/aide/aide-0.10.tar.gz
 Source1: aide.conf
 Source2: README.quickstart
+Patch0: aide-0.10-no-static.patch
 Patch1: aide-useless-includes.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 Buildrequires: mhash-devel zlib-devel
@@ -25,7 +28,9 @@
 
 %prep
 %setup -q -n aide-0.10
-
+%if 0%{nostatic}
+%patch0 -p1 -b .no-static
+%endif
 %patch1 -p1
 
 %build
@@ -75,6 +80,9 @@
 
 
 %changelog
+* Thu Mar  2 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.10-3
+- disable static linking.
+
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 




More information about the fedora-extras-commits mailing list