Update to 2.32 and clean up spec file

This commit is contained in:
Emmanuel Seyman 2012-01-12 15:54:33 +01:00
parent f9ba4a68f1
commit 6bc82c6232
3 changed files with 10 additions and 15 deletions

1
.gitignore vendored
View File

@ -1,2 +1,3 @@
JSON-XS-2.27.tar.gz JSON-XS-2.27.tar.gz
/JSON-XS-2.3.tar.gz /JSON-XS-2.3.tar.gz
/JSON-XS-2.32.tar.gz

View File

@ -1,14 +1,12 @@
%define real_version 2.3
Name: perl-JSON-XS Name: perl-JSON-XS
Summary: JSON serialising/deserialising, done correctly and fast Summary: JSON serialising/deserialising, done correctly and fast
Epoch: 1 Epoch: 1
# previous version was 2.27 Version: 2.32
Version: 2.30 Release: 1%{?dist}
Release: 3%{?dist}
License: GPL+ or Artistic License: GPL+ or Artistic
Group: Development/Libraries Group: Development/Libraries
URL: http://search.cpan.org/dist/JSON-XS/ URL: http://search.cpan.org/dist/JSON-XS/
Source0: http://www.cpan.org/authors/id/M/ML/MLEHMANN/JSON-XS-%{real_version}.tar.gz Source0: http://www.cpan.org/authors/id/M/ML/MLEHMANN/JSON-XS-%{version}.tar.gz
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildRequires: perl(common::sense) BuildRequires: perl(common::sense)
@ -16,8 +14,6 @@ BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: perl(Test::More) BuildRequires: perl(Test::More)
Requires: perl(common::sense) Requires: perl(common::sense)
# because of 2.3 upstream version and 2.30 rpm version
Provides: perl(JSON::XS) = 2.30
%{?perl_default_filter} %{?perl_default_filter}
%{?perl_default_subpackage_tests} %{?perl_default_subpackage_tests}
@ -28,7 +24,7 @@ primary goal is to be correct and its secondary goal is to be fast. To
reach the latter goal it was written in C. reach the latter goal it was written in C.
%prep %prep
%setup -q -n JSON-XS-%{real_version} %setup -q -n JSON-XS-%{version}
sed -i 's/\r//' t/* sed -i 's/\r//' t/*
perl -pi -e 's|^#!/opt/bin/perl|#!%{__perl}|' eg/* perl -pi -e 's|^#!/opt/bin/perl|#!%{__perl}|' eg/*
@ -39,8 +35,6 @@ chmod -c -x eg/*
make %{?_smp_mflags} make %{?_smp_mflags}
%install %install
rm -rf %{buildroot}
make pure_install DESTDIR=%{buildroot} make pure_install DESTDIR=%{buildroot}
find %{buildroot} -type f -name .packlist -exec rm -f {} + find %{buildroot} -type f -name .packlist -exec rm -f {} +
@ -52,11 +46,7 @@ find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;
%check %check
make test make test
%clean
rm -rf %{buildroot}
%files %files
%defattr(-,root,root,-)
%doc Changes COPYING README eg/ %doc Changes COPYING README eg/
%{perl_vendorarch}/* %{perl_vendorarch}/*
%exclude %dir %{perl_vendorarch}/auto %exclude %dir %{perl_vendorarch}/auto
@ -64,6 +54,10 @@ rm -rf %{buildroot}
%{_mandir}/man[13]/* %{_mandir}/man[13]/*
%changelog %changelog
* Thu Jan 12 2012 Emmanuel Seyman <emmanuel.seyman@club-internet.fr> - 1:2.32-1
- Update to 2.32
- Clean up spec file
* Sun Jun 19 2011 Marcela Mašláňová <mmaslano@redhat.com> - 1:2.30-3 * Sun Jun 19 2011 Marcela Mašláňová <mmaslano@redhat.com> - 1:2.30-3
- Perl mass rebuild - Perl mass rebuild

View File

@ -1 +1 @@
4dc2a968e41f8cf330d46be12f221a12 JSON-XS-2.3.tar.gz 87f71c78010083ad4d158b5765c4a609 JSON-XS-2.32.tar.gz