rpms/volume_key/devel volume_key-0.3.3-off_t.patch, NONE, 1.1 volume_key.spec, 1.9, 1.10

Miloslav Trmac mitr at fedoraproject.org
Thu Jul 22 12:58:16 UTC 2010


Author: mitr

Update of /cvs/pkgs/rpms/volume_key/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv17284

Modified Files:
	volume_key.spec 
Added Files:
	volume_key-0.3.3-off_t.patch 
Log Message:
* Thu Jul 22 2010 Miloslav Trmač <mitr at redhat.com> - 0.3.3-3
- Fix build with new gpgme


volume_key-0.3.3-off_t.patch:
 configure.ac |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE volume_key-0.3.3-off_t.patch ---
2010-07-22  Miloslav Trmač  <mitr at redhat.com>

	* configure.ac: Use AC_SYS_LARGEFILE, required by gpgme.

diff --git a/configure.ac b/configure.ac
index e39ce62..7d8220e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -59,6 +59,8 @@ AC_DEFINE([GETTEXT_PACKAGE], ["volume_key"], [Package name for <gi18n-lib.h>])
 # Checks for library functions.
 
 # Checks for system services.
+dnl We don't use off_t, but gpgme requires this.
+AC_SYS_LARGEFILE
 
 # Miscellaneous hackery.
 
-- 
1.7.1.1



Index: volume_key.spec
===================================================================
RCS file: /cvs/pkgs/rpms/volume_key/devel/volume_key.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- volume_key.spec	22 Jul 2010 07:11:45 -0000	1.9
+++ volume_key.spec	22 Jul 2010 12:58:14 -0000	1.10
@@ -3,15 +3,19 @@
 Summary: An utility for manipulating storage encryption keys and passphrases
 Name: volume_key
 Version: 0.3.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Group: Applications/System
 URL: https://fedorahosted.org/volume_key/
 Requires: volume_key-libs = %{version}-%{release}
 
 Source0: https://fedorahosted.org/releases/v/o/volume_key/volume_key-%{version}.tar.xz
+# Upstream commit 6c31fc813c5329b343a44822eb04ef27f07b3367
+Patch0: volume_key-0.3.3-off_t.patch
 BuildRequires: cryptsetup-luks-devel, gettext-devel, glib2-devel, gnupg
 BuildRequires: gpgme-devel, libblkid-devel, nss-devel, python-devel
+# For patch0
+BuildRequires: autoconf automake gettext-autopoint libtool
 
 %description
 This package provides a command-line tool for manipulating storage volume
@@ -73,6 +77,8 @@ for other formats is possible, some form
 
 %prep
 %setup -q
+%patch0 -p1
+autoreconf -fis
 
 %build
 %configure
@@ -113,6 +119,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/volume_key.py*
 
 %changelog
+* Thu Jul 22 2010 Miloslav Trmač <mitr at redhat.com> - 0.3.3-3
+- Fix build with new gpgme
+
 * Thu Jul 22 2010 David Malcolm <dmalcolm at redhat.com> - 0.3.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
 



More information about the scm-commits mailing list