From 3146397b9c56210e5264b26ba301e8a8dc020892 Mon Sep 17 00:00:00 2001 From: Tim Fenn Date: Sep 29 2014 02:28:33 +0000 Subject: update to 0.9.5.1 - remove convert_image due to mktemp call --- diff --git a/.gitignore b/.gitignore index 4090b48..d2fed4a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /CBFlib-0.9.2.3.tar.gz +/CBFlib-0.9.5.1.tar.gz diff --git a/CBFlib.spec b/CBFlib.spec index 8d5b587..9a5f571 100644 --- a/CBFlib.spec +++ b/CBFlib.spec @@ -1,7 +1,7 @@ Summary: Crystallographic Binary File and Image Library Name: CBFlib -Version: 0.9.2.3 -Release: 7%{?dist} +Version: 0.9.5.1 +Release: 1%{?dist} # library files (*.so*) are LGPLv2+, all else is GPLv2+ License: GPLv2+ and (GPLv2+ or LGPLv2+) Group: System Environment/Libraries @@ -9,6 +9,8 @@ URL: http://www.bernstein-plus-sons.com/software/CBF Source0: http://downloads.sourceforge.net/cbflib/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-gfortran +BuildRequires: hdf5-devel +BuildRequires: pcre-devel %description CBFlib (Crystallographic Binary File library) is a library of ANSI-C @@ -42,7 +44,7 @@ chmod 644 examples/*.c # make %{?_smp_mflags} cd src gcc -fPIC -DCBF_DONT_USE_LONG_LONG -D_USE_XOPEN_EXTENDED %{optflags} -c *.c ../examples/img.c -I../include/ -I../examples/ -gcc -shared -Wl,-soname,libcbf.so.0 -o libcbf.so.0.0.0 *.o -lm +gcc -shared -Wl,-soname,libcbf.so.0 -o libcbf.so.0.0.0 *.o -lhdf5 -lz -lm rm *.o gfortran -fPIC -fno-range-check %{optflags} -c *.f90 -I../include/ gfortran -shared -Wl,-soname,libfcb.so.0 -o libfcb.so.0.0.0 *.o @@ -54,8 +56,8 @@ adscimg2cbf" for i in $utilsublist; do gcc %{optflags} ${i}.c ${i}_sub.c -I../include ../src/libcbf.so.0.0.0 -o ${i} done -utillist="convert_image -convert_minicbf +# convert_image (taken out due to mktemp call) +utillist="convert_minicbf makecbf img2cif cif2cbf @@ -86,8 +88,8 @@ adscimg2cbf" for i in $utilsublist; do install -p -m 755 examples/${i} %{buildroot}%{_bindir}/ done -utillist="convert_image -convert_minicbf +# convert_image (taken out due to mktemp call) +utillist="convert_minicbf makecbf img2cif cif2cbf @@ -113,7 +115,7 @@ rm -rf %{buildroot} # GPLv2+ %{_bindir}/adscimg2cbf %{_bindir}/cbf2adscimg -%{_bindir}/convert_image +# %{_bindir}/convert_image %{_bindir}/convert_minicbf %{_bindir}/makecbf %{_bindir}/img2cif @@ -136,6 +138,10 @@ rm -rf %{buildroot} %{_includedir}/cbf %changelog +* Sun Sep 28 2014 Tim Fenn - 0.9.5.1-1 +- update to 0.9.5.1 +- remove convert_image due to mktemp call + * Fri Aug 15 2014 Fedora Release Engineering - 0.9.2.3-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/sources b/sources index 8226894..752c6ea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -90c566de5d9b8a57edffb3c328f3066b CBFlib-0.9.2.3.tar.gz +dfa4331c6dfbef0566eacf53e707fad2 CBFlib-0.9.5.1.tar.gz