diff --git a/.gitignore b/.gitignore index 5e6a19d..f8909fa 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,5 @@ gnupg-1.4.10.tar.bz2.sig /gnupg-1.4.11.tar.gz.sig /gnupg-1.4.11.tar.bz2 /gnupg-1.4.11.tar.bz2.sig +/gnupg-1.4.12.tar.bz2 +/gnupg-1.4.12.tar.bz2.sig diff --git a/gnupg-1.4.1-gcc.patch b/gnupg-1.4.1-gcc.patch index 0d048fe..d54328e 100644 --- a/gnupg-1.4.1-gcc.patch +++ b/gnupg-1.4.1-gcc.patch @@ -1,9 +1,32 @@ -Call gcc directly to build assembly files, so that CFLAGS which are needed -during preprocessing (-DPIC) get properly passed to the preprocessor. +From e89e07669e5bb46023f08d5c0b69065a931f9d27 Mon Sep 17 00:00:00 2001 +From: "Brian C. Lane" +Date: Mon, 30 Jan 2012 09:47:40 -0800 +Subject: [PATCH] Call gcc directly to build assembly files, so that CFLAGS + which are needed during preprocessing (-DPIC) get properly + passed to the preprocessor. ---- gnupg-1.4.1/mpi/Makefile.am 2005-03-11 05:27:02.000000000 -0500 -+++ gnupg-1.4.1/mpi/Makefile.am 2005-03-15 23:47:29.000000000 -0500 -@@ -71,9 +71,14 @@ +--- + configure.ac | 1 + + mpi/Makefile.am | 5 +++++ + 2 files changed, 6 insertions(+), 0 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 5dc0a52..55d9bc2 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1398,6 +1398,7 @@ fi + + AM_CONDITIONAL(CROSS_COMPILING, test x$cross_compiling = xyes) + ++AM_CONDITIONAL(USING_GCC, test x$GCC = xyes) + + # add some extra libs here so that previous tests don't fail for + # mysterious reasons - the final link step should bail out. +diff --git a/mpi/Makefile.am b/mpi/Makefile.am +index 7610e27..27d36b8 100644 +--- a/mpi/Makefile.am ++++ b/mpi/Makefile.am +@@ -69,9 +69,14 @@ libmpi_a_LIBADD = $(common_asm_objects) @MPI_EXTRA_ASM_OBJS@ # cancel the default rules used by libtool which do not really # work and add one to cpp .S files @@ -18,13 +41,6 @@ during preprocessing (-DPIC) get properly passed to the preprocessor. +endif .S.lo: ---- gnupg-1.4.1/configure.ac 2005-03-15 10:51:52.000000000 -0500 -+++ gnupg-1.4.1/configure.ac 2005-03-15 23:47:29.000000000 -0500 -@@ -1232,6 +1232,7 @@ - - AM_CONDITIONAL(CROSS_COMPILING, test x$cross_compiling = xyes) - -+AM_CONDITIONAL(USING_GCC, test x$GCC = xyes) - - # add some extra libs here so that previous tests don't fail for - # mysterious reasons - the final link step should bail out. +-- +1.7.6.5 + diff --git a/gnupg.spec b/gnupg.spec index bb1df06..3cba8d2 100644 --- a/gnupg.spec +++ b/gnupg.spec @@ -1,7 +1,7 @@ Summary: A GNU utility for secure communication and data storage Name: gnupg -Version: 1.4.11 -Release: 3%{?dist} +Version: 1.4.12 +Release: 1%{?dist} License: GPLv3+ with exceptions Group: Applications/System Source0: ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2 @@ -113,6 +113,9 @@ exit 0 %{_mandir}/man7/gnupg.7.gz %changelog +* Mon Jan 30 2012 Brian C. Lane - 1.4.12-1 +- New upstream v1.4.12 + * Tue Feb 08 2011 Fedora Release Engineering - 1.4.11-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index 658b7c1..70e2a26 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -411744e1ef8ce90b87938c4203f001f1 gnupg-1.4.11.tar.bz2 -4fcc7f0f8cf8a729b3ffba0f602b8eea gnupg-1.4.11.tar.bz2.sig +ce3742e5c7912559cab7894ad8ba7f6b gnupg-1.4.12.tar.bz2 +fc1d196fe7cd5a3a0a3f12e654d32a0c gnupg-1.4.12.tar.bz2.sig