diff --git a/.gitignore b/.gitignore index d0a77f5..da9f228 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ Sys-CPU-0.51.tar.gz /Sys-CPU-0.52.tar.gz +/Sys-CPU-0.54.tar.gz diff --git a/Sys-CPU-0.52-Add-support-for-Linux-on-s390.patch b/Sys-CPU-0.52-Add-support-for-Linux-on-s390.patch deleted file mode 100644 index ce319a2..0000000 --- a/Sys-CPU-0.52-Add-support-for-Linux-on-s390.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 2c6e746e5e96f7c6c131db7d8f9366ae002a17cb Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Mon, 5 Nov 2012 11:26:55 +0100 -Subject: [PATCH] Add support for Linux on s390 - ---- - CPU.xs | 19 +++++++++++++++++-- - 1 file changed, 17 insertions(+), 2 deletions(-) - -diff --git a/CPU.xs b/CPU.xs -index b77d0c0..564e855 100644 ---- a/CPU.xs -+++ b/CPU.xs -@@ -269,6 +269,17 @@ int proc_cpuinfo_clock (void) { - return (0); - } - -+#ifdef __s390__ || __s390x__ -+/* Return machine value from s390 processor line, NULL if not found */ -+char *processor_machine_field (char *processor) { -+ char *machine = NULL; -+ if (NULL == processor) return NULL; -+ if (NULL != (machine = strstr(processor, "machine = "))) { -+ machine += 10; -+ } -+ return machine; -+} -+#endif - #endif - - int get_cpu_count() { -@@ -354,11 +365,15 @@ SV * - cpu_type() - CODE: - { -- char *value = malloc(MAX_IDENT_SIZE); -+ char *value = NULL; - int retcode = 0; - #ifdef __linux__ -- value = proc_cpuinfo_field ("model name"); -+#ifdef __s390__ || __s390x__ -+ value = processor_machine_field (proc_cpuinfo_field ("processor") ); -+#endif -+ if (!value) value = proc_cpuinfo_field ("model name"); - if (!value) value = proc_cpuinfo_field ("machine"); -+ if (!value) value = proc_cpuinfo_field ("vendor_id"); - #endif - #ifdef WINDOWS - retcode = GetSysInfoKey("Identifier",value); --- -1.7.11.7 - diff --git a/perl-Sys-CPU.spec b/perl-Sys-CPU.spec index db90108..e54d902 100644 --- a/perl-Sys-CPU.spec +++ b/perl-Sys-CPU.spec @@ -1,6 +1,6 @@ Name: perl-Sys-CPU -Version: 0.52 -Release: 2%{?dist} +Version: 0.54 +Release: 1%{?dist} Summary: Getting CPU information Group: Development/Libraries # Some code was copied from Unix::Processors, which is LGPLv3 or Artistic 2.0 @@ -8,9 +8,7 @@ Group: Development/Libraries # See . License: (GPL+ or Artistic) and (LGPLv3 or Artistic 2.0) URL: http://search.cpan.org/~mkoderer/Sys-CPU/ -Source0: http://search.cpan.org/CPAN/authors/id/M/MK/MKODERER/Sys-CPU-%{version}.tar.gz -# Support for s390, CPAN RT #80633 -Patch0: Sys-CPU-0.52-Add-support-for-Linux-on-s390.patch +Source0: http://search.cpan.org/CPAN/authors/id/M/MZ/MZSANFORD/Sys-CPU-%{version}.tar.gz BuildRequires: perl(ExtUtils::MakeMaker) # Run-time: BuildRequires: perl(DynaLoader) @@ -25,7 +23,6 @@ Currently only number of CPU's supported. %prep %setup -q -n Sys-CPU-%{version} -%patch0 -p1 sed -i 's/\r//' Changes README %build @@ -49,6 +46,9 @@ find %{buildroot} -type f -name CPU.bs -exec rm -f {} ';' %changelog +* Tue Nov 13 2012 Petr Pisar - 0.54-1 +- 0.54 bump + * Mon Nov 05 2012 Petr Pisar - 0.52-2 - Add support for s390 (CPAN RT #80633) diff --git a/sources b/sources index ed01549..575b8f8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -34305423e86cfca9a631b6f91217f90f Sys-CPU-0.52.tar.gz +bc4d77c09ca06794b5a466c8c53cac08 Sys-CPU-0.54.tar.gz