rpms/perl-Mail-SPF-Query/devel .cvsignore, 1.2, 1.3 perl-Mail-SPF-Query.spec, 1.2, 1.3 sources, 1.2, 1.3 use-sys-hostname.patch, 1.1, 1.2 MSQ-fallback.patch, 1.1, NONE

Steven Pritchard (steve) fedora-extras-commits at redhat.com
Fri Mar 10 22:07:14 UTC 2006


Author: steve

Update of /cvs/extras/rpms/perl-Mail-SPF-Query/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11198

Modified Files:
	.cvsignore perl-Mail-SPF-Query.spec sources 
	use-sys-hostname.patch 
Removed Files:
	MSQ-fallback.patch 
Log Message:
Update to 1.999.1.
Drop MSQ-fallback.patch (upstream seems to have a similar fix).
Update use-sys-hostname.patch.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Mail-SPF-Query/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	4 Aug 2005 15:59:58 -0000	1.2
+++ .cvsignore	10 Mar 2006 22:07:14 -0000	1.3
@@ -1 +1 @@
-Mail-SPF-Query-1.997.tar.gz
+Mail-SPF-Query-1.999.1.tar.gz


Index: perl-Mail-SPF-Query.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Mail-SPF-Query/devel/perl-Mail-SPF-Query.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Mail-SPF-Query.spec	6 Sep 2005 00:49:52 -0000	1.2
+++ perl-Mail-SPF-Query.spec	10 Mar 2006 22:07:14 -0000	1.3
@@ -1,13 +1,12 @@
 Name:           perl-Mail-SPF-Query
-Version:        1.997
-Release:        5%{?dist}
+Version:        1.999.1
+Release:        1%{?dist}
 Summary:        Mail::SPF::Query Perl module
 License:        GPL or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Mail-SPF-Query/
 Source0:        http://www.cpan.org/modules/by-module/Mail/Mail-SPF-Query-%{version}.tar.gz
 # From Paul Howarth
-Patch0:         MSQ-fallback.patch
 Patch1:         use-sys-hostname.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
@@ -25,9 +24,10 @@
 
 %prep
 %setup -q -n Mail-SPF-Query-%{version}
-%patch0 -p1
 %patch1 -p1
 
+chmod -x examples/* bin/*
+
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
 %{__perl} -pi -e 's/^\tLD_RUN_PATH=[^\s]+\s*/\t/' Makefile
@@ -48,6 +48,7 @@
 
 # Don't include the spfd and spfquery scripts in _bindir.
 rm -f $RPM_BUILD_ROOT%{_bindir}/spfd $RPM_BUILD_ROOT%{_bindir}/spfquery
+rm -rf $RPM_BUILD_ROOT%{_mandir}/man1
 
 # Does a lot of external DNS lookups.
 %check
@@ -58,11 +59,16 @@
 
 %files
 %defattr(-,root,root,-)
-%doc Changes README sample spfd spfquery COPYING Artistic
+%doc CHANGES README examples/ bin/ COPYING Artistic
 %{perl_vendorlib}/*
 %{_mandir}/man3/*
 
 %changelog
+* Fri Mar 10 2006 Steven Pritchard <steve at kspei.com> 1.999.1-1
+- Update to 1.999.1
+- Drop MSQ-fallback.patch (upstream seems to have a similar fix)
+- Update use-sys-hostname.patch
+
 * Mon Sep 05 2005 Steven Pritchard <steve at kspei.com> 1.997-5
 - Spec cleanup
 - Include COPYING and Artistic


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Mail-SPF-Query/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Aug 2005 15:59:58 -0000	1.2
+++ sources	10 Mar 2006 22:07:14 -0000	1.3
@@ -1 +1 @@
-9e110d00520e0fe174c25c0734a8baf6  Mail-SPF-Query-1.997.tar.gz
+6d62d024d1614fa1fa4f43bd39ee7bf0  Mail-SPF-Query-1.999.1.tar.gz

use-sys-hostname.patch:

Index: use-sys-hostname.patch
===================================================================
RCS file: /cvs/extras/rpms/perl-Mail-SPF-Query/devel/use-sys-hostname.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- use-sys-hostname.patch	4 Aug 2005 15:59:58 -0000	1.1
+++ use-sys-hostname.patch	10 Mar 2006 22:07:14 -0000	1.2
@@ -1,12 +1,20 @@
---- Mail-SPF-Query-1.997.orig/Query.pm	2005-07-21 15:24:38.000000000 -0500
-+++ Mail-SPF-Query-1.997/Query.pm	2005-07-21 15:25:32.000000000 -0500
-@@ -325,8 +325,7 @@
+--- Mail-SPF-Query-1.999.1/lib/Mail/SPF/Query.pm.orig	2006-02-26 11:41:11.000000000 -0600
++++ Mail-SPF-Query-1.999.1/lib/Mail/SPF/Query.pm	2006-03-10 15:56:05.000000000 -0600
+@@ -23,7 +23,7 @@
+ our $VERSION = '1.999.1';  # fake version for EU::MM and CPAN
+ $VERSION = '1.999001';     # real numerical version
+ 
+-use Sys::Hostname::Long;
++use Sys::Hostname;
+ use Net::DNS qw();  # by default it exports mx, which we define.
+ use Net::CIDR::Lite;
+ use URI::Escape;
+@@ -296,7 +296,7 @@
+                            $query->{ipv6} ? die "IPv6 not supported" : "");
  
    if (not $query->{myhostname}) {
-     use Sys::Hostname; 
--    eval { require Sys::Hostname::Long };
--    $query->{myhostname} = $@ ? hostname() : Sys::Hostname::Long::hostname_long();
+-    $query->{myhostname} = Sys::Hostname::Long::hostname_long();
 +    $query->{myhostname} = hostname();
    }
- 
    $query->{myhostname} ||= "localhost";
+ 


--- MSQ-fallback.patch DELETED ---




More information about the fedora-extras-commits mailing list