rpms/gnupg2/FC-4 gnupg2.spec,1.12,1.13

Rex Dieter (rdieter) fedora-extras-commits at redhat.com
Tue Aug 9 16:06:28 UTC 2005


Author: rdieter

Update of /cvs/extras/rpms/gnupg2/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv453/FC-4

Modified Files:
	gnupg2.spec 
Log Message:
* Tue Aug  9 2005 Rex Dieter <rexdieter[AT]users.sf.net> - 1.9.18-6
- don't 'make check' by default (regular builds pass, but FC4/5+plague fails)



Index: gnupg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/FC-4/gnupg2.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gnupg2.spec	8 Aug 2005 20:46:31 -0000	1.12
+++ gnupg2.spec	9 Aug 2005 16:06:26 -0000	1.13
@@ -6,7 +6,7 @@
 Summary: GNU utility for secure communication and data storage
 Name:    gnupg2
 Version: 1.9.18
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group:   Applications/System
 Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}.tar.bz2
@@ -22,8 +22,6 @@
 Requires(post): /sbin/install-info
 Requires(postun): /sbin/install-info
 
-%{!?_without_pie:%define _with_pie --with pie} 
-
 BuildRequires: libassuan-devel >= 0.6.10
 BuildRequires: libgcrypt-devel => 1.2.0
 BuildRequires: libgpg-error-devel => 1.0
@@ -74,8 +72,8 @@
 
 %build
 
-%{?_with_pie:CFLAGS="$RPM_OPT_FLAGS -fPIE" ; export CFLAGS}
-%{?_with_pie:LDFLAGS="$RPM_OPT_FLAGS -pie" ; export LDFLAG}
+%{!?_without_pie:CFLAGS="$RPM_OPT_FLAGS -fPIE" ; export CFLAGS}
+%{!?_without_pie:LDFLAGS="$RPM_OPT_FLAGS -pie" ; export LDFLAG}
 
 %configure \
   --disable-dependency-tracking \
@@ -86,7 +84,7 @@
 
 
 %check || :
-make check
+%{?_with_check:make check}
 
 
 %install
@@ -136,6 +134,9 @@
 
 
 %changelog
+* Tue Aug  9 2005 Rex Dieter <rexdieter[AT]users.sf.net> - 1.9.18-6
+- don't 'make check' by default (regular builds pass, but FC4/5+plague fails)
+
 * Mon Aug  8 2005 Rex Dieter <rexdieter[AT]users.sf.net> - 1.9.18-5
 - 1.9.18
 - drop pth patch (--enable-gpg build fixed)




More information about the scm-commits mailing list