diff --git a/.gitignore b/.gitignore index 7460e7c..b76b6f1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ cln-1.3.1.tar.bz2 /cln-1.3.2.tar.bz2 +/cln-1.3.3.tar.bz2 diff --git a/cln-1.3.1-s390x.patch b/cln-1.3.1-s390x.patch deleted file mode 100644 index c0b1082..0000000 --- a/cln-1.3.1-s390x.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- include/cln/types.h 2009-06-14 15:49:32.000000000 -0400 -+++ include/cln/types.h.new 2009-12-29 09:01:31.751401399 -0500 -@@ -48,7 +48,7 @@ - #undef HAVE_LONGLONG - #endif - #endif -- #if defined(HAVE_LONGLONG) && (defined(__alpha__) || defined(__ia64__) || defined(__mips64__) || defined(__powerpc64__) || defined(__sparc64__) || defined(__x86_64__)) -+ #if defined(HAVE_LONGLONG) && (defined(__alpha__) || defined(__ia64__) || defined(__mips64__) || defined(__powerpc64__) || defined(__s390x__) || defined(__sparc64__) || defined(__x86_64__)) - // 64 bit registers in hardware - #define HAVE_FAST_LONGLONG - #endif -@@ -127,7 +127,7 @@ - typedef int sintD; - typedef unsigned int uintD; - #else // we are not using GMP, so just guess something reasonable -- #if (defined(HAVE_FAST_LONGLONG) && (defined(__alpha__) || defined(__ia64__) || defined(__powerpc64__) || defined(__x86_64__))) -+ #if (defined(HAVE_FAST_LONGLONG) && (defined(__alpha__) || defined(__ia64__) || defined(__powerpc64__) || defined(__s390x__) || defined(__x86_64__))) - #define intDsize 64 - typedef sint64 sintD; - typedef uint64 uintD; diff --git a/cln.spec b/cln.spec index ab6a2ed..97d8329 100644 --- a/cln.spec +++ b/cln.spec @@ -1,15 +1,13 @@ Name: cln -Version: 1.3.2 -Release: 8%{?dist} +Version: 1.3.3 +Release: 1%{?dist} Summary: Class Library for Numbers Group: System Environment/Libraries License: GPLv2+ URL: http://www.ginac.de/CLN/ Source0: http://www.ginac.de/CLN/%{name}-%{version}.tar.bz2 -Patch1: cln-1.3.1-s390x.patch -Patch2: cln-arm-preprocessor-fix.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch1: cln-arm-preprocessor-fix.patch Requires(post): /sbin/install-info Requires(preun): /sbin/install-info @@ -42,8 +40,7 @@ the CLN library. %prep %setup -q -%patch1 -p0 -b .s390x -%patch2 -p0 -b .fix +%patch1 -p0 -b .fix %build %configure --disable-static CXXFLAGS="%{XFLAGS}" CFLAGS="%{XFLAGS}" @@ -62,9 +59,6 @@ rm -rf %{buildroot}%{_bindir} %{buildroot}%{_mandir}/man1/pi.* %check make %{_smp_mflags} check -%clean -rm -rf %{buildroot} - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -91,6 +85,9 @@ fi %doc doc/cln.pdf doc/cln.html %changelog +* Wed Aug 14 2013 Deji Akingunola - 1.3.3-1 +- New upstream version + * Tue Aug 06 2013 Deji Akingunola - 1.3.2-8 - Package the devel documents in unversioned docdir (BZ #993702) diff --git a/sources b/sources index f7d61fc..39b8808 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d897cce94d9c34d106575ed4ec865d71 cln-1.3.2.tar.bz2 +9871c401133a12182ad6a3bed89fb3c4 cln-1.3.3.tar.bz2