diff --git a/.cvsignore b/.cvsignore index 2131e8d..2a85321 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,4 +1,2 @@ -gnupg-1.9.23.tar.bz2 -gnupg-1.9.23.tar.bz2.sig -gnupg-1.9.91.tar.bz2.sig -gnupg-1.9.92.tar.bz2.sig +gnupg-1.9.93.tar.bz2 +gnupg-1.9.93.tar.bz2.sig diff --git a/gnupg-1.9.91-readline.patch b/gnupg-1.9.91-readline.patch deleted file mode 100644 index 6e350bf..0000000 --- a/gnupg-1.9.91-readline.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- gnupg-1.9.91/common/gpgrlhelp.c.readline 2006-09-22 03:01:00.000000000 -0500 -+++ gnupg-1.9.91/common/gpgrlhelp.c 2006-10-05 07:40:43.000000000 -0500 -@@ -31,6 +31,7 @@ - - #ifdef HAVE_LIBREADLINE - #define GNUPG_LIBREADLINE_H_INCLUDED -+#include - #include - #include - #endif diff --git a/gnupg2.spec b/gnupg2.spec index 4b411d7..175b63f 100644 --- a/gnupg2.spec +++ b/gnupg2.spec @@ -11,8 +11,8 @@ Summary: Utility for secure communication and data storage Name: gnupg2 -Version: 1.9.92 -Release: 2%{?dist} +Version: 1.9.93 +Release: 1%{?dist} License: GPL Group: Applications/System @@ -111,10 +111,8 @@ sed -i -e 's/"libpcsclite\.so"/"%{pcsclib}"/' scd/{scdaemon,pcsc-wrapper}.c make -%check ||: -## Allows for better debugability (doesn't work, fixme) -# echo "debug-allow-core-dumps" >> tests/gpgsm.conf -# (sometimes?) expect one failure (reported upstream) +%check +# some gpg2 tests (still) FAIL make -k check ||: @@ -134,7 +132,6 @@ install -p -m0755 %{SOURCE11} $RPM_BUILD_ROOT%{kde_scriptdir}/shutdown/ #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 ||: @@ -185,6 +182,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Oct 18 2006 Rex Dieter 1.9.93-1 +- 1.9.93 + * Wed Oct 11 2006 Rex Dieter 1.9.92-2 - fix file conflicts with gnupg diff --git a/sources b/sources index 3dca6e6..c14b67e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -1d0b7ce8c5ff98976253e78a3e20c3a7 gnupg-1.9.92.tar.bz2.sig -46fc473680ff5586184ddb53e7e18277 gnupg-1.9.92.tar.bz2 +fc2d20e6e8aba396953768b503bf07fe gnupg-1.9.93.tar.bz2.sig +84b1af5b6c489fcbbbbf4f219aaf2526 gnupg-1.9.93.tar.bz2