[packages/metaio] - updated to 8.4.0 - updated format-security patch (one part obsolete) - drop .la file

qboosh qboosh at pld-linux.org
Sat Jul 1 13:30:13 CEST 2017


commit f8e77ca1f9d2e7971dce4993af8de2eb9f3d6fa2
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Jul 1 13:31:43 2017 +0200

    - updated to 8.4.0
    - updated format-security patch (one part obsolete)
    - drop .la file

 format-security.patch | 11 ---------
 metaio.spec           | 62 +++++++++++++++++++++++++++++++++++----------------
 2 files changed, 43 insertions(+), 30 deletions(-)
---
diff --git a/metaio.spec b/metaio.spec
index 23a4690..ca2953e 100644
--- a/metaio.spec
+++ b/metaio.spec
@@ -1,49 +1,65 @@
-Summary:	This package contains a library for parsing LIGO_LW Table files
+# TODO: matlab (octave?)
+Summary:	Library for parsing LIGO_LW Table files
+Summary(pl.UTF-8):	Biblioteka do analizy plików tablic LIGO_LW
 Name:		metaio
-Version:	8.3.0
-Release:	2
-License:	GPL v2
+Version:	8.4.0
+Release:	1
+License:	GPL v2+
 Group:		Libraries
-Source0:	https://www.lsc-group.phys.uwm.edu/daswg/download/software/source/%{name}-%{version}.tar.gz
-# Source0-md5:	4d244197051fc1c1a9c2c5f82e14dc4c
+Source0:	http://software.ligo.org/lscsoft/source/%{name}-%{version}.tar.gz
+# Source0-md5:	65661cfb47643623bc8cbe97ddbe7b91
 Patch0:		format-security.patch
 URL:		https://www.lsc-group.phys.uwm.edu/daswg/projects/metaio.html
-BuildRequires:	autoconf
+BuildRequires:	autoconf >= 2.69
 BuildRequires:	automake
-BuildRequires:	libtool
-BuildRequires:	zlib-devel
+BuildRequires:	libtool >= 2:2
+BuildRequires:	zlib-devel >= 1.2
+Requires:	zlib >= 1.2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 This package contains a library for parsing LIGO_LW Table files, plus
 several C programs based on the library, plus a few Tcl scripts which
 do related things. The metiao library can read XML files compressed
-with the gzip compression algorithm. Metaio is available via the
-lscsoft repository, from source of via LIGOtools.
+with the gzip compression algorithm.
+
+%description -l pl.UTF-8
+Ten pakiet zawiera bibliotekę do analizy plików tablic LIGO_LW oraz
+kilka programów w C opartych na tej bibliotece, a także kilka skryptów
+Tcl-a, wykonujących podobne zadania. Biblioteka metaio potrafi czytać
+pliki XML skompresowane algorytmem gzip.
 
 %package devel
-Summary:	Devel files
+Summary:	Header files for metaio library
+Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki metaio
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 
 %description devel
-Development files.
+Header files for metaio library.
+
+%description devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki metaio.
 
 %package static
 Summary:	Static metaio library
+Summary(pl.UTF-8):	Statyczna biblioteka metaio
 Group:		Development/Libraries
 Requires:	%{name}-devel = %{version}-%{release}
 
 %description static
 Static metaio library.
 
+%description static -l pl.UTF-8
+Statyczna biblioteka metaio.
+
 %prep
 %setup -q
 %patch0 -p1
 
 %build
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I gnuscripts
 %{__autoconf}
 %{__autoheader}
 %{__automake}
@@ -56,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+# obsoleted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libmetaio.la
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -64,19 +83,24 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS README
-%attr(755,root,root) %{_bindir}/*
+%doc AUTHORS HISTORY README
+%attr(755,root,root) %{_bindir}/_getMetaLoopHelper
+%attr(755,root,root) %{_bindir}/concatMeta
+%attr(755,root,root) %{_bindir}/lwtcut
+%attr(755,root,root) %{_bindir}/lwtdiff
+%attr(755,root,root) %{_bindir}/lwtprint
+%attr(755,root,root) %{_bindir}/lwtscan
+%attr(755,root,root) %{_bindir}/lwtselect
 %attr(755,root,root) %{_libdir}/libmetaio.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libmetaio.so.1
 
 %files devel
 %defattr(644,root,root,755)
-%{_libdir}/libmetaio.la
-%{_libdir}/libmetaio.so
+%attr(755,root,root) %{_libdir}/libmetaio.so
 %{_includedir}/ligo_lw_header.h
 %{_includedir}/metaio.h
 %{_pkgconfigdir}/libmetaio.pc
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libmetaio.a
diff --git a/format-security.patch b/format-security.patch
index 15ff696..8ca5c83 100644
--- a/format-security.patch
+++ b/format-security.patch
@@ -1,14 +1,3 @@
---- metaio-8.3.0/src/metaio.c.orig	2014-01-18 13:49:24.428739303 +0100
-+++ metaio-8.3.0/src/metaio.c	2014-01-18 13:50:23.651747305 +0100
-@@ -2486,7 +2486,7 @@ int MetaioCreate( const MetaioParseEnv e
-         return status;
- 
-     /*-- Write out the LIGO_LW header --*/
--    fprintf( env->file->fp, MetaIO_Header);
-+    fputs( MetaIO_Header, env->file->fp);
- 
-     return 0;
- }
 --- metaio-8.3.0/src/lwtprint.c.orig	2014-01-18 13:52:24.527772497 +0100
 +++ metaio-8.3.0/src/lwtprint.c	2014-01-18 13:53:20.884130507 +0100
 @@ -513,7 +513,7 @@ int main( int argc, char **argv )
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/metaio.git/commitdiff/f8e77ca1f9d2e7971dce4993af8de2eb9f3d6fa2



More information about the pld-cvs-commit mailing list