From b1e80f52502f17c02537cad4e269c50b0aae7b0d6249a4b311d122ce47c5578c Mon Sep 17 00:00:00 2001 From: Christian Wittmer Date: Tue, 20 Apr 2010 22:15:11 +0000 Subject: [PATCH 1/4] Accepting request 38382 from home:computersalat:devel:perl Copy from home:computersalat:devel:perl/perl-TimeDate via accept of submit request 38382 revision 4. Request was accepted with message: self accept OBS-URL: https://build.opensuse.org/request/show/38382 OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl-TimeDate?expand=0&rev=13 --- perl-TimeDate.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl-TimeDate.spec b/perl-TimeDate.spec index 2fb418f..8428945 100644 --- a/perl-TimeDate.spec +++ b/perl-TimeDate.spec @@ -22,7 +22,7 @@ Name: perl-TimeDate %define cpan_name TimeDate Summary: Parse date strings into time values Version: 1.20 -Release: 2 +Release: 1 License: Artistic License .. Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/TimeDate From e3d59212a78beb62142caa413fe298318a08d49352164e99b1fdbd2bc832c07a Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Tue, 20 Apr 2010 23:54:14 +0000 Subject: [PATCH 2/4] Accepting request 38383 from devel:languages:perl checked in (request 38383) OBS-URL: https://build.opensuse.org/request/show/38383 OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl-TimeDate?expand=0&rev=14 --- TimeDate-deprecated_array_use.patch | 14 +++++++++++--- perl-TimeDate.changes | 14 -------------- perl-TimeDate.spec | 18 ++++-------------- 3 files changed, 15 insertions(+), 31 deletions(-) diff --git a/TimeDate-deprecated_array_use.patch b/TimeDate-deprecated_array_use.patch index cfbd396..a9f5fee 100644 --- a/TimeDate-deprecated_array_use.patch +++ b/TimeDate-deprecated_array_use.patch @@ -1,6 +1,5 @@ -diff -ruN TimeDate-1.20-orig/lib/Date/Format.pm TimeDate-1.20/lib/Date/Format.pm ---- TimeDate-1.20-orig/lib/Date/Format.pm 2009-12-12 12:30:06.000000000 +0000 -+++ TimeDate-1.20/lib/Date/Format.pm 2010-04-20 21:15:56.049364922 +0000 +--- lib/Date/Format.pm.orig 2009-09-19 09:04:02.000000000 -0700 ++++ lib/Date/Format.pm 2009-09-25 14:33:09.000000000 -0700 @@ -83,7 +83,7 @@ $tzname = sprintf("%+05d",$tzname) unless($tzname =~ /\D/); @@ -10,3 +9,12 @@ diff -ruN TimeDate-1.20-orig/lib/Date/Format.pm TimeDate-1.20/lib/Date/Format.pm @$me = gmtime($epoch + tz_offset($tzname) - tz_offset()); } +@@ -215,7 +215,7 @@ + sub format_M { sprintf("%02d",$_[0]->[1]) } + sub format_q { sprintf("%01d",int($_[0]->[4] / 3) + 1) } + sub format_s { +- $epoch = timegm(@{$_[0]}[0..5]) ++ $epoch = timegm($_[0], $_[1], $_[2], $_[3], $_[4], $_[5] ) + unless defined $epoch; + sprintf("%d",$epoch) + } diff --git a/perl-TimeDate.changes b/perl-TimeDate.changes index 306f882..65651a2 100644 --- a/perl-TimeDate.changes +++ b/perl-TimeDate.changes @@ -1,17 +1,3 @@ -------------------------------------------------------------------- -Tue Apr 20 22:07:57 UTC 2010 - chris@computersalat.de - -- fix build - o reworked TimeDate-deprecated_array_use.patch (was for timegm) - removed obsolete part (timegm was replaced by timelocal) -- cleanup spec - o add missing Url -- fix deps for perl-macros -- removed .packlist, perllocal.pod files - > noarch package -- rpmlint - o script-without-shebang > 644 - ------------------------------------------------------------------- Mon Apr 19 13:51:59 CEST 2010 - dmueller@suse.de diff --git a/perl-TimeDate.spec b/perl-TimeDate.spec index 8428945..85aaf89 100644 --- a/perl-TimeDate.spec +++ b/perl-TimeDate.spec @@ -25,16 +25,13 @@ Version: 1.20 Release: 1 License: Artistic License .. Group: Development/Libraries/Perl -Url: http://search.cpan.org/dist/TimeDate +AutoReqProv: on Source: %{cpan_name}-%{version}.tar.gz Patch1: %{cpan_name}-deprecated_array_use.patch Patch2: %{cpan_name}-podfile-patch -BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl -%if 0%{?suse_version} < 1120 BuildRequires: perl-macros -%endif Requires: perl = %{perl_version} Provides: %{cpan_name} @@ -58,12 +55,9 @@ Provides: %{cpan_name} %prep %setup -q -n %{cpan_name}-%{version} -%patch1 -p1 +%patch1 %patch2 -# script-without-shebang -find -type f -exec chmod 0644 {} \; - %build perl Makefile.PL OPTIMIZE="$RPM_OPT_FLAGS -Wall" %{__make} %{?jobs:-j%jobs} @@ -73,11 +67,7 @@ perl Makefile.PL OPTIMIZE="$RPM_OPT_FLAGS -Wall" %install %perl_make_install -# do not perl_process_packlist (noarch) -# remove .packlist file -%{__rm} -rf $RPM_BUILD_ROOT%perl_vendorarch -# remove perllocal.pod file -%{__rm} -rf $RPM_BUILD_ROOT%perl_archlib +%perl_process_packlist %perl_gen_filelist %clean @@ -86,6 +76,6 @@ perl Makefile.PL OPTIMIZE="$RPM_OPT_FLAGS -Wall" %files -f %{name}.files # normally you only need to check for doc files %defattr(-,root,root) -%doc ChangeLog README SIGNATURE +%doc ChangeLog README %changelog From 0b952e95572d2a7f17690d8eadaa917970647fcb8b0ae1371a33f75395e0d9c4 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 30 Nov 2010 19:29:21 +0000 Subject: [PATCH 3/4] siwtch to perl_requires macro OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl-TimeDate?expand=0&rev=15 --- TimeDate-deprecated_array_use.patch | 14 +++----------- perl-TimeDate.changes | 19 +++++++++++++++++++ perl-TimeDate.spec | 22 ++++++++++++++++------ 3 files changed, 38 insertions(+), 17 deletions(-) diff --git a/TimeDate-deprecated_array_use.patch b/TimeDate-deprecated_array_use.patch index a9f5fee..cfbd396 100644 --- a/TimeDate-deprecated_array_use.patch +++ b/TimeDate-deprecated_array_use.patch @@ -1,5 +1,6 @@ ---- lib/Date/Format.pm.orig 2009-09-19 09:04:02.000000000 -0700 -+++ lib/Date/Format.pm 2009-09-25 14:33:09.000000000 -0700 +diff -ruN TimeDate-1.20-orig/lib/Date/Format.pm TimeDate-1.20/lib/Date/Format.pm +--- TimeDate-1.20-orig/lib/Date/Format.pm 2009-12-12 12:30:06.000000000 +0000 ++++ TimeDate-1.20/lib/Date/Format.pm 2010-04-20 21:15:56.049364922 +0000 @@ -83,7 +83,7 @@ $tzname = sprintf("%+05d",$tzname) unless($tzname =~ /\D/); @@ -9,12 +10,3 @@ @$me = gmtime($epoch + tz_offset($tzname) - tz_offset()); } -@@ -215,7 +215,7 @@ - sub format_M { sprintf("%02d",$_[0]->[1]) } - sub format_q { sprintf("%01d",int($_[0]->[4] / 3) + 1) } - sub format_s { -- $epoch = timegm(@{$_[0]}[0..5]) -+ $epoch = timegm($_[0], $_[1], $_[2], $_[3], $_[4], $_[5] ) - unless defined $epoch; - sprintf("%d",$epoch) - } diff --git a/perl-TimeDate.changes b/perl-TimeDate.changes index 65651a2..644bdda 100644 --- a/perl-TimeDate.changes +++ b/perl-TimeDate.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Tue Nov 30 19:20:55 UTC 2010 - coolo@novell.com + +- switch to perl_requires macro + +------------------------------------------------------------------- +Tue Apr 20 22:07:57 UTC 2010 - chris@computersalat.de + +- fix build + o reworked TimeDate-deprecated_array_use.patch (was for timegm) + removed obsolete part (timegm was replaced by timelocal) +- cleanup spec + o add missing Url +- fix deps for perl-macros +- removed .packlist, perllocal.pod files + > noarch package +- rpmlint + o script-without-shebang > 644 + ------------------------------------------------------------------- Mon Apr 19 13:51:59 CEST 2010 - dmueller@suse.de diff --git a/perl-TimeDate.spec b/perl-TimeDate.spec index 85aaf89..fc1f300 100644 --- a/perl-TimeDate.spec +++ b/perl-TimeDate.spec @@ -22,17 +22,20 @@ Name: perl-TimeDate %define cpan_name TimeDate Summary: Parse date strings into time values Version: 1.20 -Release: 1 +Release: 2 License: Artistic License .. Group: Development/Libraries/Perl -AutoReqProv: on +Url: http://search.cpan.org/dist/TimeDate Source: %{cpan_name}-%{version}.tar.gz Patch1: %{cpan_name}-deprecated_array_use.patch Patch2: %{cpan_name}-podfile-patch +BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl +%if 0%{?suse_version} < 1120 BuildRequires: perl-macros -Requires: perl = %{perl_version} +%endif +%{perl_requires} Provides: %{cpan_name} %description @@ -55,9 +58,12 @@ Provides: %{cpan_name} %prep %setup -q -n %{cpan_name}-%{version} -%patch1 +%patch1 -p1 %patch2 +# script-without-shebang +find -type f -exec chmod 0644 {} \; + %build perl Makefile.PL OPTIMIZE="$RPM_OPT_FLAGS -Wall" %{__make} %{?jobs:-j%jobs} @@ -67,7 +73,11 @@ perl Makefile.PL OPTIMIZE="$RPM_OPT_FLAGS -Wall" %install %perl_make_install -%perl_process_packlist +# do not perl_process_packlist (noarch) +# remove .packlist file +%{__rm} -rf $RPM_BUILD_ROOT%perl_vendorarch +# remove perllocal.pod file +%{__rm} -rf $RPM_BUILD_ROOT%perl_archlib %perl_gen_filelist %clean @@ -76,6 +86,6 @@ perl Makefile.PL OPTIMIZE="$RPM_OPT_FLAGS -Wall" %files -f %{name}.files # normally you only need to check for doc files %defattr(-,root,root) -%doc ChangeLog README +%doc ChangeLog README SIGNATURE %changelog From c1a6dcb64eabf42878877f644bf1a4fbcbfb1c0196b7c38e6ef72f8632bc002a Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Fri, 3 Dec 2010 14:54:37 +0000 Subject: [PATCH 4/4] always buildrequire perl-macros if not present, move %perl_requires behind buildroot (script commit) OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl-TimeDate?expand=0&rev=16 --- perl-TimeDate.spec | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/perl-TimeDate.spec b/perl-TimeDate.spec index fc1f300..a8d2332 100644 --- a/perl-TimeDate.spec +++ b/perl-TimeDate.spec @@ -31,11 +31,9 @@ Patch1: %{cpan_name}-deprecated_array_use.patch Patch2: %{cpan_name}-podfile-patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: perl -%if 0%{?suse_version} < 1120 -BuildRequires: perl-macros -%endif %{perl_requires} +BuildRequires: perl +BuildRequires: perl-macros Provides: %{cpan_name} %description