From 10f2d1d81466c19d28653779478d3b0ba1ac0c25 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Feb 10 2020 09:12:21 +0000 Subject: 1.61 bump; Use make_build and make_install macros --- diff --git a/.gitignore b/.gitignore index 0abbdcc..b36d152 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /DBD-ODBC-1.58.tar.gz /DBD-ODBC-1.59.tar.gz /DBD-ODBC-1.60.tar.gz +/DBD-ODBC-1.61.tar.gz diff --git a/Changes.patch b/Changes.patch index 560aa76..3b780ae 100644 --- a/Changes.patch +++ b/Changes.patch @@ -1,16 +1,25 @@ -diff -up DBD-ODBC-1.60/Changes.orig DBD-ODBC-1.60/Changes ---- DBD-ODBC-1.60/Changes.orig 2018-10-31 17:00:57.000000000 +0100 -+++ DBD-ODBC-1.60/Changes 2018-11-08 10:22:55.955446555 +0100 +diff -up DBD-ODBC-1.61/Changes.orig DBD-ODBC-1.61/Changes +--- DBD-ODBC-1.61/Changes.orig 2020-01-30 15:59:57.000000000 +0100 ++++ DBD-ODBC-1.61/Changes 2020-02-10 10:04:43.325090560 +0100 @@ -5,7 +5,7 @@ use strict; DBD::ODBC::Changes - Log of significant changes to the DBD::ODBC +-1.61 2020-01-30 ++=head2 1.61 2020-01-30 + + [BUG FIXES] + +@@ -20,7 +20,7 @@ DBD::ODBC::Changes - Log of significant + + Fix travis builds for older Perls by pali + -1.60 2018-10-31 +=head2 1.60 2018-10-31 [BUG FIXES] -@@ -16,20 +16,20 @@ DBD::ODBC::Changes - Log of significant +@@ -31,20 +31,20 @@ DBD::ODBC::Changes - Log of significant Merged pull request 10 from vadz which fixed typo (affecting license) in README.md. @@ -34,7 +43,7 @@ diff -up DBD-ODBC-1.60/Changes.orig DBD-ODBC-1.60/Changes [MISCELLANEOUS] -@@ -39,19 +39,19 @@ DBD::ODBC::Changes - Log of significant +@@ -54,19 +54,19 @@ DBD::ODBC::Changes - Log of significant This version was removed from CPAN because it was uploaded with a nasty bug in the diagnostics code. @@ -57,7 +66,7 @@ diff -up DBD-ODBC-1.60/Changes.orig DBD-ODBC-1.60/Changes [BUG FIXES] -@@ -76,14 +76,14 @@ DBD::ODBC::Changes - Log of significant +@@ -91,14 +91,14 @@ DBD::ODBC::Changes - Log of significant Remove duplicate dynamic_config from META.yml. @@ -74,7 +83,7 @@ diff -up DBD-ODBC-1.60/Changes.orig DBD-ODBC-1.60/Changes [BUG FIXES] -@@ -95,7 +95,7 @@ DBD::ODBC::Changes - Log of significant +@@ -110,7 +110,7 @@ DBD::ODBC::Changes - Log of significant Try and make the test suite run ok for SQLite ODBC driver so I can use it in travis-ci. @@ -83,7 +92,7 @@ diff -up DBD-ODBC-1.60/Changes.orig DBD-ODBC-1.60/Changes [BUG FIXES] -@@ -104,7 +104,7 @@ DBD::ODBC::Changes - Log of significant +@@ -119,7 +119,7 @@ DBD::ODBC::Changes - Log of significant with "string data, right truncation" on the second and subsequent calls to execute. Thanks to Laura Cox for finding. @@ -92,7 +101,7 @@ diff -up DBD-ODBC-1.60/Changes.orig DBD-ODBC-1.60/Changes [BUG FIXES] -@@ -113,7 +113,7 @@ DBD::ODBC::Changes - Log of significant +@@ -128,7 +128,7 @@ DBD::ODBC::Changes - Log of significant introduced last year. Thanks to Nick Gorham for spotting and providing a fix. @@ -101,7 +110,7 @@ diff -up DBD-ODBC-1.60/Changes.orig DBD-ODBC-1.60/Changes [BUG FIXES] -@@ -121,14 +121,14 @@ DBD::ODBC::Changes - Log of significant +@@ -136,14 +136,14 @@ DBD::ODBC::Changes - Log of significant client. Identify "libmsodbcsql*" as the MS ODBC Driver for Linux as there are some specific workarounds for MS Native Client ODBC driver. @@ -118,7 +127,7 @@ diff -up DBD-ODBC-1.60/Changes.orig DBD-ODBC-1.60/Changes [BUG FIXES] -@@ -177,14 +177,14 @@ DBD::ODBC::Changes - Log of significant +@@ -192,14 +192,14 @@ DBD::ODBC::Changes - Log of significant I have removed the "experimental" tag for odbc_getdiagfield and odbc_getdiagrec methods. diff --git a/perl-DBD-ODBC.spec b/perl-DBD-ODBC.spec index 0f283fb..829f29a 100644 --- a/perl-DBD-ODBC.spec +++ b/perl-DBD-ODBC.spec @@ -1,6 +1,6 @@ Name: perl-DBD-ODBC -Version: 1.60 -Release: 5%{?dist} +Version: 1.61 +Release: 1%{?dist} Summary: ODBC Driver for DBI License: GPL+ or Artistic URL: https://metacpan.org/release/DBD-ODBC @@ -8,13 +8,13 @@ Source0: https://cpan.metacpan.org/modules/by-module/DBD/DBD-ODBC-%{versi BuildRequires: findutils BuildRequires: gcc BuildRequires: make -BuildRequires: perl-interpreter BuildRequires: perl-devel BuildRequires: perl-generators +BuildRequires: perl-interpreter BuildRequires: perl(Config) BuildRequires: perl(DBI::DBD) BuildRequires: perl(English) -BuildRequires: perl(ExtUtils::MakeMaker) +BuildRequires: perl(ExtUtils::MakeMaker) >= 6.76 BuildRequires: perl(File::Basename) BuildRequires: perl(File::Spec) BuildRequires: perl(Getopt::Long) @@ -58,12 +58,12 @@ module uses the unixODBC manager to connect to the database. %patch0 -p1 %build -PERL_MM_USE_DEFAULT=1 %{__perl} Makefile.PL -u INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" -make %{?_smp_mflags} +PERL_MM_USE_DEFAULT=1 %{__perl} Makefile.PL -u INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" \ + NO_PACKLIST=1 NO_PERLLOCAL=1 +%{make_build} %install -make pure_install DESTDIR=$RPM_BUILD_ROOT -find $RPM_BUILD_ROOT -type f -name .packlist -delete +%{make_install} find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -delete %{_fixperms} $RPM_BUILD_ROOT/* @@ -77,6 +77,10 @@ make test %{_mandir}/man3/* %changelog +* Mon Feb 10 2020 Jitka Plesnikova - 1.61-1 +- 1.61 bump +- Use make_build and make_install macros + * Wed Jan 29 2020 Fedora Release Engineering - 1.60-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index d0ff528..8295f17 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (DBD-ODBC-1.60.tar.gz) = 35a365ff305e412c59cb24e6be4f06d2f0fab15154023689a14c928af87a801dad26f95ab91212469dd3e3170a1b7b73aac660b306c25f87d2fd2e02c03048ed +SHA512 (DBD-ODBC-1.61.tar.gz) = cd20a505b64fd6a6d9a5158c134f9337a9f40879516e4fcb45270dcc20d88ade1ddcf856e36db72b8ca57e34052284f794532f55f0a1f6469cd3d8dff0103435