rpms/gnupg2
7
0
Fork 0
Code Issues Pull Requests Releases Activity

adjust to the unversioned docdir change (#993785)

Browse Source
This commit is contained in:
Tomas Mraz 2013-08-07 13:15:50 +02:00
parent 2c3f005808
commit 8a0c14a695
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gnupg2.spec
View File

@ -1,7 +1,7 @@
Summary: Utility for secure communication and data storage Summary: Utility for secure communication and data storage
Name: gnupg2 Name: gnupg2
Version: 2.0.20 Version: 2.0.20
Release: 2%{?dist} Release: 3%{?dist}
License: GPLv3+ License: GPLv3+
Group: Applications/System Group: Applications/System
@ -45,6 +45,8 @@ Provides: gnupg = %{version}-%{release}
Obsoletes: gnupg <= 1.4.10 Obsoletes: gnupg <= 1.4.10
%endif %endif
%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
%package smime %package smime
Summary: CMS encryption and signing tool and smart card support for GnuPG Summary: CMS encryption and signing tool and smart card support for GnuPG
Requires: gnupg2 = %{version}-%{release} Requires: gnupg2 = %{version}-%{release}
@ -102,7 +104,7 @@ make %{?_smp_mflags}
%install %install
make install DESTDIR=%{buildroot} \ make install DESTDIR=%{buildroot} \
INSTALL="install -p" \ INSTALL="install -p" \
docdir=%{_docdir}/%{name}-%{version} docdir=%{_pkgdocdir}
%if ! (0%{?rhel} > 5) %if ! (0%{?rhel} > 5)
# drop file conflicting with gnupg-1.x # drop file conflicting with gnupg-1.x
@ -117,7 +119,7 @@ touch %{buildroot}%{_sysconfdir}/gnupg/gpgconf.conf
# more docs # more docs
install -m644 -p AUTHORS COPYING ChangeLog NEWS THANKS TODO \ install -m644 -p AUTHORS COPYING ChangeLog NEWS THANKS TODO \
%{buildroot}%{_docdir}/%{name}-%{version}/ %{buildroot}%{_pkgdocdir}
%if 0%{?rhel} > 5 %if 0%{?rhel} > 5
# compat symlinks # compat symlinks
@ -150,7 +152,7 @@ fi
%files -f %{name}.lang %files -f %{name}.lang
%defattr(-,root,root,-) %defattr(-,root,root,-)
#doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO #doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO
%{_docdir}/%{name}-%{version}/ %{_pkgdocdir}
%dir %{_sysconfdir}/gnupg %dir %{_sysconfdir}/gnupg
%ghost %config(noreplace) %{_sysconfdir}/gnupg/gpgconf.conf %ghost %config(noreplace) %{_sysconfdir}/gnupg/gpgconf.conf
## docs say to install suid root, but fedora/rh security folk say not to ## docs say to install suid root, but fedora/rh security folk say not to
@ -191,6 +193,9 @@ fi
%changelog %changelog
* Wed Aug 7 2013 Tomas Mraz <tmraz@redhat.com> - 2.0.20-3
- adjust to the unversioned docdir change (#993785)
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.20-2 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.20-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild