rpms/gnupg2/devel gnupg2.spec,1.55,1.56

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/gnupg2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30603

Modified Files:
	gnupg2.spec 
Log Message:
* Mon Nov 06 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.95-2
- fix (more) file conflicts with gnupg



Index: gnupg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- gnupg2.spec	6 Nov 2006 13:16:45 -0000	1.55
+++ gnupg2.spec	6 Nov 2006 16:55:47 -0000	1.56
@@ -130,15 +130,12 @@
 
 %find_lang %{name}
 
-## NOTE:
-#file /usr/bin/gpg-zip from install of gnupg2-1.9.92-1.fc6 conflicts with file from package gnupg-1.4.5-4
-#file /usr/bin/gpgsplit from install of gnupg2-1.9.92-1.fc6 conflicts with file from package gnupg-1.4.5-4
-#file /usr/share/man/man7/gnupg.7.gz from install of gnupg2-1.9.92-1.fc6 conflicts with file from package gnupg-1.4.5-4
+# file conflicts with gnupg-1.x 
 rm -f $RPM_BUILD_ROOT%{_bindir}/{gpgsplit,gpg-zip} 
+rm -f $RPM_BUILD_ROOT%{_datadir}/gnupg/{FAQ,faq.html}
 mv $RPM_BUILD_ROOT%{_mandir}/man7/gnupg.7 $RPM_BUILD_ROOT%{_mandir}/man7/gnupg2.7 ||:
 
-
-## Unpackaged files
+# Unpackaged files
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
 
@@ -184,6 +181,9 @@
 
 
 %changelog
+* Mon Nov 06 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.95-2
+- fix (more) file conflicts with gnupg
+
 * Mon Nov 06 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.95-1
 - 1.9.95