rpms/gnupg2/FC-6 .cvsignore, 1.14, 1.15 gnupg2.spec, 1.53, 1.54 sources, 1.16, 1.17 gnupg-1.9.91-dearmor.patch, 1.1, NONE
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Thu Nov 16 21:00:16 UTC 2006
Author: rdieter
Update of /cvs/extras/rpms/gnupg2/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3506
Modified Files:
.cvsignore gnupg2.spec sources
Removed Files:
gnupg-1.9.91-dearmor.patch
Log Message:
* Thu Nov 16 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2.0.0-4
- update %%description
- drop dearmor patch
* Mon Nov 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2.0.0-3
- BR: libassuan-static >= 1.0.0
* Mon Nov 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2.0.0-2
- 2.0.0
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/FC-6/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore 18 Oct 2006 18:43:44 -0000 1.14
+++ .cvsignore 16 Nov 2006 20:59:45 -0000 1.15
@@ -1,2 +1,4 @@
-gnupg-1.9.93.tar.bz2
-gnupg-1.9.93.tar.bz2.sig
+gnupg-1.9.95.tar.bz2
+gnupg-1.9.95.tar.bz2.sig
+gnupg-2.0.0.tar.bz2
+gnupg-2.0.0.tar.bz2.sig
Index: gnupg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/FC-6/gnupg2.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- gnupg2.spec 18 Oct 2006 18:43:44 -0000 1.53
+++ gnupg2.spec 16 Nov 2006 20:59:45 -0000 1.54
@@ -1,23 +1,21 @@
-# Keep an eye on http://bugzilla.redhat.com/175744, in case these dirs go away or change
+## Keep an eye on http://bugzilla.redhat.com/175744,
+## in case these dirs go away or change
%if "%{?fedora}" > "3" || "%{?rhel}" > "4"
%define kde_scriptdir %{_sysconfdir}/kde
%else
%define kde_scriptdir %{_prefix}
%endif
-# define to build/include gpg2 binary
-%define _enable_gpg --enable-gpg
-
Summary: Utility for secure communication and data storage
Name: gnupg2
-Version: 1.9.93
-Release: 1%{?dist}
+Version: 2.0.0
+Release: 4%{?dist}
License: GPL
Group: Applications/System
-Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}.tar.bz2
-Source1: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}.tar.bz2.sig
+Source0: ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2
+Source1: ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2.sig
URL: http://www.gnupg.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -25,15 +23,14 @@
Source10: gpg-agent-startup.sh
Source11: gpg-agent-shutdown.sh
-Patch2: gnupg-1.9.16-testverbose.patch
-Patch3: gnupg-1.9.91-dearmor.patch
+Patch1: gnupg-1.9.16-testverbose.patch
Obsoletes: newpg < 0.9.5
Requires(post): /sbin/install-info
Requires(postun): /sbin/install-info
-BuildRequires: libassuan-devel >= 0.9.3
+BuildRequires: libassuan-static >= 1.0.0
BuildRequires: libgcrypt-devel => 1.2.0
BuildRequires: libgpg-error-devel => 1.4
BuildRequires: libksba-devel >= 1.0.0
@@ -55,31 +52,35 @@
Requires: fileutils util-linux
Requires: pinentry >= 0.7.1
-%if "%{?_enable_gpg:1}" == "1"
Provides: gpg
Provides: openpgp
-%endif
%description
-GnuPG 1.9 is the future version of GnuPG; it is based on some gnupg-1.3
-code and the previous newpg package. It will eventually lead to a
-GnuPG 2.0 release. Note that GnuPG 1.4 and 1.9 are not always in sync
-and thus features and bug fixes done in 1.4 are not necessarily
-available in 1.9.
-
-You should use this GnuPG version if you want to use the gpg-agent or
-gpgsm (the S/MIME variant of gpg). Note that the gpg-agent is also
-helpful when using the standard gpg versions (1.4.x as well as some of
-the old 1.2.x). There are no problems installing 1.4 and 1.9
-alongside; in act we suggest to do this.
+GnuPG is GNU's tool for secure communication and data storage. It can
+be used to encrypt data and to create digital signatures. It includes
+an advanced key management facility and is compliant with the proposed
+OpenPGP Internet standard as described in RFC2440 and the S/MIME
+standard as described by several RFCs.
+
+GnuPG 2.0 is the stable version of GnuPG integrating support for
+OpenPGP and S/MIME. It does not conflict with an installed 1.x
+OpenPGP-only version.
+
+GnuPG 2.0 is a newer version of GnuPG with additional support for
+S/MIME. It has a different design philosophy that splits
+functionality up into several modules. Both versions may be installed
+simultaneously without any conflict (gpg is called gpg2 in GnuPG 2).
+In fact, the gpg version from GnuPG 1.x is able to make use of the
+gpg-agent as included in GnuPG 2 and allows for seamless passphrase
+caching. The advantage of GnupG 1.x is its smaller size and no
+dependency on other modules at run and build time.
%prep
%setup -q -n gnupg-%{version}
-#patch2 -p1 -b .testverbose
-%patch3 -p1 -b .dearmor
+#patch1 -p1 -b .testverbose
# pcsc-lite library major: 0 in 1.2.0, 1 in 1.2.9+ (dlopen()'d in pcsc-wrapper)
# Note: this is just the name of the default shared lib to load in scdaemon,
@@ -92,17 +93,15 @@
sed -i -e 's/"libpcsclite\.so"/"%{pcsclib}"/' scd/{scdaemon,pcsc-wrapper}.c
+# need scratch gpg database for tests
+mkdir -p $HOME/.gnupg
-%build
-%ifarch x86_64
-#export CFLAGS="%(echo %{optflags} | sed -e 's|-O2|-O1|')"
-%endif
+%build
%configure \
--disable-rpath \
--enable-selinux-support \
- %{?_enable_gpg} \
%ifarch x86_64
--disable-optimization
%endif
@@ -111,11 +110,6 @@
make
-%check
-# some gpg2 tests (still) FAIL
-make -k check ||:
-
-
%install
rm -rf $RPM_BUILD_ROOT
@@ -128,18 +122,20 @@
%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
+%check
+# some gpg2 tests (still) FAIL
+make -k check ||:
+
+
%post
/sbin/install-info %{_infodir}/gnupg.info %{_infodir}/dir ||:
@@ -148,15 +144,14 @@
/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
-%if "%{?_enable_gpg:1}" == "1"
#docs say to install suid root, but we won't, for now.
#attr(4755,root,root) %{_bindir}/gpg2
%{_bindir}/gpg2
%{_bindir}/gpgv2
-%endif
%{_bindir}/gpg-connect-agent
%{_bindir}/gpg-agent
%{_bindir}/gpgconf
@@ -177,11 +172,34 @@
%{kde_scriptdir}/env/*.sh
%{kde_scriptdir}/shutdown/*.sh
+
%clean
rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu Nov 16 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2.0.0-4
+- update %%description
+- drop dearmor patch
+
+* Mon Nov 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2.0.0-3
+- BR: libassuan-static >= 1.0.0
+
+* Mon Nov 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2.0.0-2
+- 2.0.0
+
+* Fri Nov 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.95-3
+- upstream 64bit patch
+
+* 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
+
+* Wed Oct 25 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.94-1
+- 1.9.94
+
* Wed Oct 18 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.93-1
- 1.9.93
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/FC-6/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources 18 Oct 2006 18:43:44 -0000 1.16
+++ sources 16 Nov 2006 20:59:46 -0000 1.17
@@ -1,2 +1,2 @@
-fc2d20e6e8aba396953768b503bf07fe gnupg-1.9.93.tar.bz2.sig
-84b1af5b6c489fcbbbbf4f219aaf2526 gnupg-1.9.93.tar.bz2
+65dc5da3bd4ec127f81c584c8200d813 gnupg-2.0.0.tar.bz2.sig
+13c0d43bd1f4a129de470dda20192284 gnupg-2.0.0.tar.bz2
--- gnupg-1.9.91-dearmor.patch DELETED ---
More information about the scm-commits
mailing list