- P:, O:, symlink reverted.

Changed files:
    gnupg2.spec -> 1.30

diff --git a/gnupg2.spec b/gnupg2.spec
index 71ea268ea868a20988b311e67052a1212cf9b2c3..a9da56b4842844d4c8231043dff9dcaae07de376 100644 (file)
--- a/gnupg2.spec
+++ b/gnupg2.spec
@@ -28,8 +28,6 @@ BuildRequires:        opensc-devel >= 0.8.0
 BuildRequires: texinfo
 BuildRequires: zlib-devel
 Requires:      gnupg2-common = %{version}-%{release}
-Provides:      gnupg = %{version}-%{release}
-Obsoletes:     gnupg
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _libexecdir     %{_libdir}/gnupg2
@@ -120,8 +118,6 @@ install -d $RPM_BUILD_ROOT/etc/profile.d
        DESTDIR=$RPM_BUILD_ROOT \
        pkglibdir=%{_libexecdir}
 
-ln -sf %{_bindir}/gpg2 $RPM_BUILD_ROOT%{_bindir}/gpg
-
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/profile.d/gnupg-agent.sh
 %{?with_xinitrc:ln -sf /etc/profile.d/gnupg-agent.sh $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d/gnupg-agent.sh}
 
@@ -142,7 +138,6 @@ rm -rf $RPM_BUILD_ROOT
 %files 
 %defattr(644,root,root,755)
 %doc g10-ChangeLog g10/options.skel
-%{_bindir}/gpg
 %attr(755,root,root) %{_bindir}/gpg2
 %attr(755,root,root) %{_bindir}/gpgv2