Attachment 10616 Details for Bug 22958 – Proposed changes to gnupg2.spec

[patch] Proposed changes to gnupg2.spec

gnupg2.spec.diff (text/plain), 2.05 KB, created by Stig-Ørjan Smelror on 2018-12-27 23:48:14 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Stig-Ørjan Smelror

Created: 2018-12-27 23:48:14 CET

Size: 2.05 KB

patch

obsolete

>--- gnupg2/SPECS/gnupg2.spec	2018-12-27 23:23:03.970512648 +0100
>+++ SPECS/gnupg2.spec	2018-12-27 23:44:20.873940421 +0100
>@@ -3,7 +3,7 @@
> Summary:	GNU privacy guard - a free PGP replacement
> Name:		gnupg2
> Version:	2.2.12
>-Release:	%mkrel 1
>+Release:	%mkrel 2
> License:	GPLv3+
> Group:		File tools
> URL:		http://www.gnupg.org
>@@ -36,13 +36,14 @@
> 
> Recommends:	pinentry
> 
>-# Technically, gnupg2 doesn't need this at all...
>-Recommends:	gnupg
>-
> # dirmngr is now part of gnupg2
> Provides:	dirmngr = %{version}-%{release}
> Obsoletes:	dirmngr < 1.2.0-1
> 
>+Obsoletes:	gnupg2 < 2.2.11-3
>+Obsoletes:	gnupg < 1.4.23-3
>+Provides:	gnupg = %{version}-%{release}
>+
> 
> %description
> GnuPG is GNU's tool for secure communication and data storage.
>@@ -51,8 +52,7 @@
> with the proposed OpenPGP Internet standard as described in RFC2440.
> 
> %prep
>-%setup -q -n %{pkgname}-%{version}
>-%autopatch -p1
>+%autosetup -p1 -n %{pkgname}-%{version}
> 
> %build
> %serverbuild
>@@ -63,7 +63,6 @@
> 
> %configure2_5x \
> 	--libexecdir=%{_libexecdir}/gnupg2 \
>-	--enable-gpg-is-gpg2 \
> 	--enable-symcryptrun \
> 	--enable-g13 \
> 	--disable-rpath \
>@@ -92,6 +91,11 @@
> %__rm -rf %{buildroot}%{_datadir}/gnupg
> %__rm -rf %{buildroot}%{_docdir}/gnupg
> 
>+(cd %{buildroot}%{_bindir}; ln -s gpg gpg2 )
>+(cd %{buildroot}%{_bindir}; ln -s gpgv gpgv2 )
>+(cd %{buildroot}%{_mandir}/man1; ln -s gpg.1* gpg2.1 )
>+(cd %{buildroot}%{_mandir}/man1; ln -s gpgv.1* gpgv2.1 )
>+
> %find_lang %{name}
> 
> %post
>@@ -122,7 +126,9 @@
> %{_bindir}/watchgnupg
> %{_bindir}/gpg-connect-agent
> %{_bindir}/gpgparsemail
>+%{_bindir}/gpg
> %{_bindir}/gpg2
>+%{_bindir}/gpgv
> %{_bindir}/gpgv2
> %{_bindir}/symcryptrun
> %{_bindir}/dirmngr
>@@ -147,11 +153,13 @@
> %{_mandir}/man1/gpg-preset-passphrase.1*
> %{_mandir}/man1/gpg-wks-client.1*
> %{_mandir}/man1/gpg-wks-server.1*
>+%{_mandir}/man1/gpg.1*
> %{_mandir}/man1/gpg2.1*
>+%{_mandir}/man1/gpgv.1*
>+%{_mandir}/man1/gpgv2.1*
> %{_mandir}/man1/gpgconf.1*
> %{_mandir}/man1/gpgparsemail.1*
> %{_mandir}/man1/gpgsm.1*
>-%{_mandir}/man1/gpgv2.1*
> %{_mandir}/man1/gpgtar.1*
> %{_mandir}/man1/scdaemon.1*
> %{_mandir}/man1/symcryptrun.1*

--- gnupg2/SPECS/gnupg2.spec	2018-12-27 23:23:03.970512648 +0100
+++ SPECS/gnupg2.spec	2018-12-27 23:44:20.873940421 +0100
@@ -3,7 +3,7 @@
 Summary:	GNU privacy guard - a free PGP replacement
 Name:		gnupg2
 Version:	2.2.12
-Release:	%mkrel 1
+Release:	%mkrel 2
 License:	GPLv3+
 Group:		File tools
 URL:		http://www.gnupg.org
@@ -36,13 +36,14 @@
 
 Recommends:	pinentry
 
-# Technically, gnupg2 doesn't need this at all...
-Recommends:	gnupg
-
 # dirmngr is now part of gnupg2
 Provides:	dirmngr = %{version}-%{release}
 Obsoletes:	dirmngr < 1.2.0-1
 
+Obsoletes:	gnupg2 < 2.2.11-3
+Obsoletes:	gnupg < 1.4.23-3
+Provides:	gnupg = %{version}-%{release}
+
 
 %description
 GnuPG is GNU's tool for secure communication and data storage.
@@ -51,8 +52,7 @@
 with the proposed OpenPGP Internet standard as described in RFC2440.
 
 %prep
-%setup -q -n %{pkgname}-%{version}
-%autopatch -p1
+%autosetup -p1 -n %{pkgname}-%{version}
 
 %build
 %serverbuild
@@ -63,7 +63,6 @@
 
 %configure2_5x \
 	--libexecdir=%{_libexecdir}/gnupg2 \
-	--enable-gpg-is-gpg2 \
 	--enable-symcryptrun \
 	--enable-g13 \
 	--disable-rpath \
@@ -92,6 +91,11 @@
 %__rm -rf %{buildroot}%{_datadir}/gnupg
 %__rm -rf %{buildroot}%{_docdir}/gnupg
 
+(cd %{buildroot}%{_bindir}; ln -s gpg gpg2 )
+(cd %{buildroot}%{_bindir}; ln -s gpgv gpgv2 )
+(cd %{buildroot}%{_mandir}/man1; ln -s gpg.1* gpg2.1 )
+(cd %{buildroot}%{_mandir}/man1; ln -s gpgv.1* gpgv2.1 )
+
 %find_lang %{name}
 
 %post
@@ -122,7 +126,9 @@
 %{_bindir}/watchgnupg
 %{_bindir}/gpg-connect-agent
 %{_bindir}/gpgparsemail
+%{_bindir}/gpg
 %{_bindir}/gpg2
+%{_bindir}/gpgv
 %{_bindir}/gpgv2
 %{_bindir}/symcryptrun
 %{_bindir}/dirmngr
@@ -147,11 +153,13 @@
 %{_mandir}/man1/gpg-preset-passphrase.1*
 %{_mandir}/man1/gpg-wks-client.1*
 %{_mandir}/man1/gpg-wks-server.1*
+%{_mandir}/man1/gpg.1*
 %{_mandir}/man1/gpg2.1*
+%{_mandir}/man1/gpgv.1*
+%{_mandir}/man1/gpgv2.1*
 %{_mandir}/man1/gpgconf.1*
 %{_mandir}/man1/gpgparsemail.1*
 %{_mandir}/man1/gpgsm.1*
-%{_mandir}/man1/gpgv2.1*
 %{_mandir}/man1/gpgtar.1*
 %{_mandir}/man1/scdaemon.1*
 %{_mandir}/man1/symcryptrun.1*

Actions: View | Diff

Attachments on bug 22958: 10614 | 10615 | 10616