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

diff --git a/fam.spec b/fam.spec
index d16fd7b..f9281af 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:	3
 License:	GPL
 Group:		Daemons
 Source0:	ftp://oss.sgi.com/projects/fam/download/stable/%{name}-%{version}.tar.gz
@@ -14,11 +14,14 @@ Source3:	%{name}.sysconfig
 Patch0:		%{name}-dnotify.patch
 Patch1:		%{name}-cleanup.patch
 Patch2:		%{name}-gcc34.patch
+Patch3:		%{name}-paths.patch
+Patch4:		%{name}-gcc4.patch
 URL:		http://oss.sgi.com/projects/fam/
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtool
+BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -39,8 +42,8 @@ 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}
+Requires:	portmap
 Obsoletes:	fam < 2.7.0
 
 %description common
@@ -61,15 +64,17 @@ 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 = %{version}-%{release}
 Requires:	inetdaemon
 Requires:	portmap
+Requires:	rc-inetd
+#Requires:	xinetd
+Provides:	fam = %{version}-%{release}
 Obsoletes:	fam-standalone
-Conflicts:	rlinetd
+Conflicts:	gamin
+# RPC support doesn't seem to work in inetd/rlinetd
 Conflicts:	inetd
-#Requires:	xinetd
+Conflicts:	rlinetd
 
 %description inetd
 FAM configs for running from inetd.
@@ -81,18 +86,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(post,preun):	/sbin/chkconfig
+Requires:	%{name}-common = %{version}-%{release}
+Requires:	/sbin/chkconfig
+Requires:	rc-scripts
 Provides:	fam = %{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 +107,7 @@ Summary(pt_BR):	FAM, um monitor de altera
 License:	LGPL
 Group:		Libraries
 Obsoletes:	libfam0
+Conflicts:	gamin-libs
 
 %description libs
 Libraries for FAM.
@@ -120,6 +127,7 @@ Group:		Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	libstdc++-devel
 Obsoletes:	libfam0-devel
+Conflicts:	gamin-devel
 
 %description devel
 Includes to develop using FAM.
@@ -137,6 +145,7 @@ Summary(pt_BR):	Bibliotecas est
 License:	LGPL
 Group:		Development/Libraries
 Requires:	%{name}-devel = %{version}-%{release}
+Conflicts:	gamin-static
 
 %description static
 FAM static libraries.
@@ -152,6 +161,8 @@ Bibliotecas est
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 %build
 %{__libtoolize}
@@ -174,34 +185,27 @@ install %{SOURCE1} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/sgi_fam
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/famd
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/famd
 
+install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+install test/test.c++ $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post inetd
-if [ -f /var/lock/subsys/rc-inetd ]; then
-	/etc/rc.d/init.d/rc-inetd reload 1>&2
-else
-	echo "Type \"/etc/rc.d/init.d/rc-inetd start\" to start inet server" 1>&2
-fi
+%service -q rc-inetd reload
 
 %postun inetd
-if [ -f /var/lock/subsys/rc-inetd ]; then
-	/etc/rc.d/init.d/rc-inetd reload
+if [ "$1" = 0 ]; then
+	%service -q rc-inetd reload
 fi
 
 %post standalone
 /sbin/chkconfig --add famd
-if [ -f /var/lock/subsys/famd ]; then
-	/etc/rc.d/init.d/famd restart 1>&2
-else
-	echo "Run \"/etc/rc.d/init.d/famd start\" to start FAM daemon."
-fi
+%service famd restart "FAM daemon"
 
 %preun standalone
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/famd ]; then
-		/etc/rc.d/init.d/famd stop 1>&2
-	fi
+	%service famd stop
 	/sbin/chkconfig --del famd
 fi
 
@@ -222,7 +226,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
@@ -235,6 +239,7 @@ fi
 %{_libdir}/lib*.la
 %{_includedir}/*.h
 %{_mandir}/man3/*
+%{_examplesdir}/%{name}-%{version}
 
 %files static
 %defattr(644,root,root,755)