rpms/gnupg2/devel gnupg2.spec,1.51,1.52

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	gnupg2.spec 
Log Message:
* Wed Oct 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.92-2
- fix file conflicts with gnupg



Index: gnupg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- gnupg2.spec	11 Oct 2006 12:23:06 -0000	1.51
+++ gnupg2.spec	11 Oct 2006 14:16:26 -0000	1.52
@@ -12,7 +12,7 @@
 Summary: Utility for secure communication and data storage
 Name:    gnupg2
 Version: 1.9.92
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPL
 Group:   Applications/System
@@ -95,6 +95,10 @@
 
 %build
 
+%ifarch x86_64
+#export CFLAGS="%(echo %{optflags} | sed -e 's|-O2|-O1|')"
+%endif
+
 %configure \
   --disable-rpath \
   --enable-selinux-support \
@@ -126,6 +130,15 @@
 
 %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
+
+rm -f $RPM_BUILD_ROOT%{_bindir}/{gpgsplit,gpg-zip} 
+mv $RPM_BUILD_ROOT%{_mandir}/man7/gnupg.7 $RPM_BUILD_ROOT%{_mandir}/man7/gnupg2.7 ||:
+
+
 ## Unpackaged files
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
@@ -138,7 +151,6 @@
   /sbin/install-info --delete %{_infodir}/gnupg.info %{_infodir}/dir ||:
 fi
 
-
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO
@@ -154,8 +166,8 @@
 %{_bindir}/gpgkey2ssh
 %{_bindir}/gpgparsemail
 %{_bindir}/gpgsm*
-%{_bindir}/gpgsplit
-%{_bindir}/gpg-zip
+#{_bindir}/gpgsplit
+#{_bindir}/gpg-zip
 %{_bindir}/kbxutil
 %{_bindir}/scdaemon
 %{_bindir}/watchgnupg
@@ -168,12 +180,14 @@
 %{kde_scriptdir}/env/*.sh
 %{kde_scriptdir}/shutdown/*.sh
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Oct 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.92-2
+- fix file conflicts with gnupg
+
 * Wed Oct 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.92-1
 - 1.9.92