X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=fam.spec;h=62c4c90c22d3063705ca9ba13d04c10857dd631b;hb=ee3a4d26e189a777870c422fb7ad94780d4bdc99;hp=d16fd7ba91862958fcfc1bba7d1ec9872d884041;hpb=0054fe4b28db3e3ce0cc96d4ccaee1f4026767a0;p=packages%2Ffam.git

diff --git a/fam.spec b/fam.spec
index d16fd7b..62c4c90 100644
--- a/fam.spec
+++ b/fam.spec
@@ -3,7 +3,7 @@ Summary(pl):	Monitor zmian w plikach
 Summary(pt_BR):	FAM, um monitor de alterações em arquivos
 Name:		fam
 Version:	2.7.0
-Release:	0.1
+Release:	1.1
 License:	GPL
 Group:		Daemons
 Source0:	ftp://oss.sgi.com/projects/fam/download/stable/%{name}-%{version}.tar.gz
@@ -39,9 +39,9 @@ espec
 Summary:	FAM, the File Alteration Monitor - common files
 Summary(pl):	Monitor zmian w plikach - wspólne pliki
 Group:		Daemons
-Prereq:		portmap
-Requires:	%{name}-libs = %{version}-%{release}
-Obsoletes:	fam < 2.7.0
+Requires:	portmap
+Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
+Obsoletes:	fam < 0:2.7.0
 
 %description common
 FAM, the File Alteration Monitor, provides a daemon and an API which
@@ -61,14 +61,15 @@ espec
 Summary:	inetd configs for FAM
 Summary(pl):	Pliki konfiguracyjne do u¿ycia FAM poprzez inetd
 Group:		Daemons
-PreReq:		%{name}-common = %{version}-%{release}
-PreReq:		rc-inetd
-Provides:	fam = %{version}-%{release}
+Requires:	%{name}-common = %{epoch}:%{version}-%{release}
+Requires:	rc-inetd
 Requires:	inetdaemon
 Requires:	portmap
+Provides:	fam = %{epoch}:%{version}-%{release}
 Obsoletes:	fam-standalone
-Conflicts:	rlinetd
+Conflicts:	gamin
 Conflicts:	inetd
+Conflicts:	rlinetd
 #Requires:	xinetd
 
 %description inetd
@@ -81,18 +82,19 @@ Pliki konfiguracyjna FAM do startowania demona poprzez inetd.
 Summary:	Standalone daemon configs for FAM
 Summary(pl):	Pliki konfiguracyjne do startowania FAM w trybie standalone
 Group:		Daemons
-PreReq:		%{name}-common = %{version}-%{release}
-PreReq:		rc-scripts
+Requires:	%{name}-common = %{epoch}:%{version}-%{release}
+Requires:	rc-scripts
+Requires:	/sbin/chkconfig
 Requires(post,preun):	/sbin/chkconfig
-Provides:	fam = %{version}-%{release}
+Provides:	fam = %{epoch}:%{version}-%{release}
 Obsoletes:	fam-inetd
+Conflicts:	gamin
 
 %description standalone
 FAM configs for running as a standalone daemon.
 
 %description standalone -l pl
-Pliki konfiguracyjne FAM do startowania demona w trybie
-standalone.
+Pliki konfiguracyjne FAM do startowania demona w trybie standalone.
 
 %package libs
 Summary:	Libraries for FAM
@@ -101,6 +103,7 @@ Summary(pt_BR):	FAM, um monitor de altera
 License:	LGPL
 Group:		Libraries
 Obsoletes:	libfam0
+Conflicts:	gamin-libs
 
 %description libs
 Libraries for FAM.
@@ -117,9 +120,10 @@ Summary(pl):	Pliki nag
 Summary(pt_BR):	Arquivos para desenvolvimento com a libfam
 License:	LGPL
 Group:		Development/Libraries
-Requires:	%{name}-libs = %{version}-%{release}
+Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 Requires:	libstdc++-devel
 Obsoletes:	libfam0-devel
+Conflicts:	gamin-devel
 
 %description devel
 Includes to develop using FAM.
@@ -136,7 +140,8 @@ Summary(pl):	Biblioteki statyczne FAM
 Summary(pt_BR):	Bibliotecas estáticas para desenvolvimento com a libfam
 License:	LGPL
 Group:		Development/Libraries
-Requires:	%{name}-devel = %{version}-%{release}
+Requires:	%{name}-devel = %{epoch}:%{version}-%{release}
+Conflicts:	gamin-static
 
 %description static
 FAM static libraries.
@@ -222,7 +227,7 @@ fi
 
 %files standalone
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/sysconfig/famd
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/famd
 %attr(754,root,root) /etc/rc.d/init.d/famd
 
 %files libs