rpms/pinfo/devel pinfo.spec,1.37,1.38

[Miroslav Lichvar]

Author: mlichvar

Update of /cvs/pkgs/rpms/pinfo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28561

Modified Files:
	pinfo.spec 
Log Message:
- suppress install-info errors (#515995)
- mark config as noreplace



Index: pinfo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pinfo/devel/pinfo.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- pinfo.spec	26 Jul 2009 18:48:34 -0000	1.37
+++ pinfo.spec	24 Sep 2009 12:40:57 -0000	1.38
@@ -1,7 +1,7 @@
 Summary: An info file viewer
 Name: pinfo
 Version: 0.6.9
-Release: 10%{?dist}
+Release: 11%{?dist}
 Group: System Environment/Base
 License: GPLv2
 URL: http://pinfo.alioth.debian.org
@@ -52,8 +52,7 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc AUTHORS COPYING ChangeLog* NEWS README TECHSTUFF
-# Purposefully not flagged noreplace to ensure new versions have working config
-%config %{_sysconfdir}/pinforc
+%config(noreplace) %{_sysconfdir}/pinforc
 %{_bindir}/pinfo
 # %{_bindir}/pman
 %{_infodir}/pinfo.info*
@@ -61,12 +60,12 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 # %{_mandir}/man1/pman.1*
 
 %post
-/sbin/install-info %{_infodir}/pinfo.info.gz %{_infodir}/dir
+/sbin/install-info %{_infodir}/pinfo.info.gz %{_infodir}/dir &> /dev/null
 :
  
 %preun
 if [ $1 = 0 ]; then
-    /sbin/install-info --delete %{_infodir}/pinfo.info.gz %{_infodir}/dir
+    /sbin/install-info --delete %{_infodir}/pinfo.info.gz %{_infodir}/dir &> /dev/null
 fi
 :
 
@@ -74,6 +73,10 @@ fi
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Thu Sep 24 2009 Miroslav Lichvar <mlichvar at redhat.com> 0.6.9-11
+- suppress install-info errors (#515995)
+- mark config as noreplace
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.9-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild