stevej pushed to opendkim (el5). "Update to 2.10.1-4"

[notifications at fedoraproject.org]

>From d43f39f2beca184cca9445ad48ab36c0cfc316bc Mon Sep 17 00:00:00 2001
From: stevejenkins <steve at stevejenkins.com>
Date: Tue, 24 Mar 2015 17:33:51 -0700
Subject: Update to 2.10.1-4


diff --git a/.gitignore b/.gitignore
index 9c19e61..64f2ac5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@
 /opendkim.keygen-permissions.patch
 /opendkim.systemd-no-default-genkey.patch
 /opendkim-2.10.1.tar.gz
+/opendkim.init.patch
diff --git a/opendkim.spec b/opendkim.spec
index ae2fe46..ecb0e4c 100644
--- a/opendkim.spec
+++ b/opendkim.spec
@@ -3,7 +3,7 @@
 Summary: A DomainKeys Identified Mail (DKIM) milter to sign and/or verify mail
 Name: opendkim
 Version: 2.10.1
-Release: 2%{?dist}
+Release: 4%{?dist}
 License: BSD and Sendmail
 URL: http://opendkim.org/
 Group: System Environment/Daemons
@@ -33,7 +33,7 @@ BuildRequires: sendmail-devel
 
 Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 
-# Patch0: %{name}.patchname.patch
+Patch0: %{name}.init.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -62,7 +62,7 @@ required for developing applications against libopendkim.
 
 #%package sysvinit
 #Summary: The SysV init script to manage the OpenDKIM milter.
-#Group: System Environmnt/Daemons
+#Group: System Environment/Daemons
 #Requires: %{name} = %{version}-%{release}
 
 #%description sysvinit
@@ -77,10 +77,16 @@ required for developing applications against libopendkim.
 
 %prep
 %setup -q
-#%patch0 -p1
+%patch0 -p1
 
 %build
+# Always use system libtool instead of opendkim provided one to
+# properly handle 32 versus 64 bit detection and settings
+%define LIBTOOL LIBTOOL=`which libtool`
+
 %configure --with-db
+
+# Remove rpath
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
@@ -444,6 +450,15 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Fri Mar 24 2015 Steve Jenkins <steve at stevejenkins.com> - 2.10.1-4
+- Fixed typo in Group name
+- Added updated libtool definition
+- Additional comments in spec file
+- Patch SysV initscript to stop default key generation on startup
+
+* Thu Mar 05 2015 Adam Jackson <ajax at redhat.com> 2.10.1-3
+- Drop sysvinit subpackage from F23+
+
 * Tue Mar 03 2015 Steve Jenkins <steve at stevejenkins.com> - 2.10.1-2
 - Added IPv6 ::1 support to TrustedHosts (RH Bugzilla #1049204)
 
diff --git a/sources b/sources
index 5c703a9..15ab060 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 e75c2944634f875a301d85ab30c2d094  opendkim-2.10.1.tar.gz
+d5cc6208c52eb939b538290470c88fdb  opendkim.init.patch
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/opendkim.git/commit/?h=el5&id=d43f39f2beca184cca9445ad48ab36c0cfc316bc

--
You received this message due to your preference settings at
https://apps.fedoraproject.org/notifications//fmnscmcommits.id.fedoraproject.org/email/29390