[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/ip-sentinel/FC-3 ip-sentinel.spec,1.2,1.3



Author: ensc

Update of /cvs/extras/rpms/ip-sentinel/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2187/FC-3

Modified Files:
	ip-sentinel.spec 
Log Message:
merged with devel



Index: ip-sentinel.spec
===================================================================
RCS file: /cvs/extras/rpms/ip-sentinel/FC-3/ip-sentinel.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ip-sentinel.spec	8 Feb 2005 23:25:24 -0000	1.2
+++ ip-sentinel.spec	8 Jun 2005 16:16:26 -0000	1.3
@@ -1,6 +1,6 @@
 ## $id: ip-sentinel.spec.in,v 1.3 2003/05/26 21:53:02 ensc Exp $		--*- rpm-spec -*--
 
-# Copyright (C) 2004 Enrico Scholz <enrico scholz informatik tu-chemnitz de>
+# Copyright (C) 2004,2005 Enrico Scholz <enrico scholz informatik tu-chemnitz de>
 #  
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -17,9 +17,10 @@
 
 
 ## This package understands the following switches:
-## --without dietlibc        ...   disable usage of dietlibc
-## --without minit           ...   disable creation of 'minit' subpackage
-## --with    fedora          ...   enable fedora.us specific parts
+## --without dietlibc	     ...   disable usage of dietlibc
+## --with    dietlibc        ...   enforce dietlibc usage on archs not supporting it
+## --without minit	     ...   disable creation of 'minit' subpackage
+## --with    fedora	     ...   enable fedora.us specific parts
 ## --define  username\ name  ...   set the name of the user running the daemon
 
 
@@ -29,33 +30,39 @@
 ##
 
 
-%define uid		1
-%define useradd		/usr/sbin/%{?_with_fedora:fedora-}useradd  %{?_with_fedora:%uid }
-%define groupadd	/usr/sbin/%{?_with_fedora:fedora-}groupadd %{?_with_fedora:%uid}
-%define userdel		/usr/sbin/%{?_with_fedora:fedora-}userdel
-%define groupdel	/usr/sbin/%{?_with_fedora:fedora-}groupdel
+%global uid		1
+%global useradd		/usr/sbin/%{?_with_fedora:fedora-}useradd  %{?_with_fedora:%uid }
+%global groupadd	/usr/sbin/%{?_with_fedora:fedora-}groupadd %{?_with_fedora:%uid}
+%global userdel		/usr/sbin/%{?_with_fedora:fedora-}userdel
+%global groupdel	/usr/sbin/%{?_with_fedora:fedora-}groupdel
 
 %{!?username:%global username	ip-sentinel}
-%define service		ip-sentinel
-%define homedir		%_var/lib/ip-sentinel
-%define minitdir	%_sysconfdir/minit
-%define minitsvcdir	%minitdir/services/%name
+%global service		ip-sentinel
+%global homedir		%_var/lib/ip-sentinel
+%global minitdir	%_sysconfdir/minit
+%global minitsvcdir	%minitdir/services/%name
 
 
-%{!?release_func:%global release_func() %1}
+%global have_dietlibc		%(case %_target_cpu in (i*86|athlon) true;; (*) test '%{?dist}' != .fc3;; esac && echo 1 || echo 0)
+%if ! %have_dietlibc
+%{!?_with_dietlibc:%global	_without_dietlibc	--without dietlibc}
+%endif
+
+
+%{!?release_func:%global release_func() %1%{?dist}}
 
-Summary:	A tool to prevent unauthorized usage of IPs
+Summary:	Tool to prevent unauthorized usage of IP addresses
 Name:		ip-sentinel
-Version:	0.11
-Release:	%release_func 1
-Epoch:		0
+Version:	0.12
+Release:	%release_func 3
 License:	GPL
 Group:		System Environment/Daemons
-URL:		http://www.tu-chemnitz.de/~ensc/ip-sentinel
-Source0:	http://www.tu-chemnitz.de/~ensc/ip-sentinel/files/%name-%version.tar.bz2
-Source1:	http://www.tu-chemnitz.de/~ensc/ip-sentinel/files/%name-%version.tar.bz2.asc
+URL:		http://www.nongnu.org/ip-sentinel/
+Source0:	http://savannah.nongnu.org/download/ip-sentinel/%name-%version.tar.bz2
+Source1:	http://savannah.nongnu.org/download/ip-sentinel/%name-%version.tar.bz2.sig
 BuildRoot:	%_tmppath/%name-%version-%release-buildroot
 Requires:		init(ip-sentinel)
+BuildRequires:	which
 
 %{!?_without_dietlibc:BuildRequires:	dietlibc}
 
@@ -70,8 +77,8 @@
 Summary:		SysV initscripts for ip-sentinel
 Group:			System Environment/Base
 Provides:		init(ip-sentinel)
-Requires(preun):	%name = %epoch:%version-%release
-Requires(postun):	%name = %epoch:%version-%release
+Requires(preun):	%name = %version-%release
+Requires(postun):	%name = %version-%release
 Requires(preun):	initscripts
 Requires(postun):	initscripts
 Requires(post):		/sbin/chkconfig
@@ -82,7 +89,7 @@
 Summary:		minit initscripts for ip-sentinel
 Group:			System Environment/Base
 Provides:		init(ip-sentinel)
-Requires:		%name = %epoch:%version-%release
+Requires:		%name = %version-%release
 Requires(pre):		minit-setup
 Requires(postun):	minit-setup
 
@@ -112,26 +119,17 @@
 with the minit initconcept.
 
 
-##---------------------------------------------
-
-
 %prep
 %setup -q
 
 
-##---------------------------------------------
-
-
 %build
 %configure --enable-release \
-           --with-initrddir=%{_initrddir} \
-           --with-username=%username %{?_without_dietlibc:--disable-dietlibc}
+	   --with-initrddir=%_initrddir \
+	   --with-username=%username %{?_without_dietlibc:--disable-dietlibc}
 %__make %{?_smp_mflags} all
 
 
-##---------------------------------------------
-
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -141,23 +139,14 @@
 %{?_without_minit:rm -rf $RPM_BUILD_ROOT%minitsvcdir}
 
 
-##---------------------------------------------
-
-
 %check
 %__make check
 
 
-##---------------------------------------------
-
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-##---------------------------------------------
-
-
 %pre
 %groupadd -r %username &>/dev/null || :
 %useradd  -r -s /sbin/nologin -M -d %homedir		\
@@ -183,7 +172,6 @@
 test "$1" = 0 || %_initrddir/%service condrestart &>/dev/null
 
 
-
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README THANKS
@@ -211,6 +199,16 @@
 
 
 %changelog
+* Wed Jun  8 2005 Enrico Scholz <enrico scholz informatik tu-chemnitz de> - 0.12-3
+- added 'BuildRequires: which'
+- do not use dietlibc on non-i386 archs running FC3
+
+* Thu May 19 2005 Enrico Scholz <enrico scholz informatik tu-chemnitz de> - 0.12-2
+- use %%dist instead of %%disttag
+
+* Wed Mar 30 2005 Enrico Scholz <enrico scholz informatik tu-chemnitz de> - 0.12-1
+- updated to 0.12
+
 * Thu Aug 19 2004 Enrico Scholz <enrico scholz informatik tu-chemnitz de> - 0:0.10.2-0
 - added support for 'fedora-usermgmt' (enabled with '--with fedora' switch)
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]