- updated to 20190118 (alpha)

- removed obsolete patches

diff --git a/libodraw-bison.patch b/libodraw-bison.patch
deleted file mode 100644 (file)
index d2ed3b9..0000000
--- a/libodraw-bison.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- libodraw-20150105/libodraw/libodraw_cue_parser.y.orig      2015-01-05 19:01:57.000000000 +0100
-+++ libodraw-20150105/libodraw/libodraw_cue_parser.y   2015-01-23 22:14:43.088287239 +0100
-@@ -22,6 +22,7 @@
- 
- #include <common.h>
- #include <types.h>
-+#include <string.h>
- 
- #if defined( HAVE_STDLIB_H ) || defined( WINAPI )
- #include <stdlib.h>
-@@ -67,8 +68,16 @@
-         lba += ( ( msf_string[ 3 ] - '0' ) * 10 ) + ( msf_string[ 4 ] - '0' ); \
-         lba *= CD_FRAMES; \
-         lba += ( ( msf_string[ 6 ] - '0' ) * 10 ) + ( msf_string[ 7 ] - '0' );
-+
- %}
- 
-+%code requires {
-+typedef struct cue_parser_state cue_parser_state_t;
-+}
-+
-+%lex-param { void * NULL }
-+%parse-param { cue_parser_state_t *parser_state }
-+
- /* %name-prefix="cue_scanner_" replaced by -p cue_scanner_ */
- /* %no-lines replaced by -l */
- 
-@@ -97,8 +106,6 @@
- 
- %{
- 
--typedef struct cue_parser_state cue_parser_state_t;
--
- struct cue_parser_state
- {
-       /* The file
-@@ -224,6 +231,7 @@ extern int cue_scanner_lex(
-             void *user_data );
- 
- extern void cue_scanner_error(
-+             cue_parser_state_t *parser_state,
-              const char *error_string );
- 
- extern YY_BUFFER_STATE cue_scanner__scan_buffer(
---- libodraw-20150105/libodraw/libodraw_cue_scanner.l.orig     2015-01-05 19:01:57.000000000 +0100
-+++ libodraw-20150105/libodraw/libodraw_cue_scanner.l  2015-01-23 21:06:12.108459763 +0100
-@@ -374,6 +374,7 @@ int cue_scanner_wrap(
- }
- 
- void cue_scanner_error(
-+      cue_parser_state_t *parser_state,
-       const char *error_string )
- {
-       if( cue_scanner_suppress_error == 0 )

diff --git a/libodraw-libcsystem.patch b/libodraw-libcsystem.patch
deleted file mode 100644 (file)
index 720b7a6..0000000
--- a/libodraw-libcsystem.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- libodraw-20150105/odrawtools/odrawverify.c.orig    2015-01-05 19:01:57.000000000 +0100
-+++ libodraw-20150105/odrawtools/odrawverify.c 2015-01-23 22:39:17.438225367 +0100
-@@ -26,6 +26,9 @@
- #if defined( HAVE_STDLIB_H ) || defined( WINAPI )
- #include <stdlib.h>
- #endif
-+#if defined( HAVE_UNISTD_H )
-+#include <unistd.h>
-+#endif
- 
- #include "byte_size_string.h"
- #include "digest_hash.h"

diff --git a/libodraw-libhmac.patch b/libodraw-libhmac.patch
deleted file mode 100644 (file)
index 278471d..0000000
--- a/libodraw-libhmac.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libodraw-20150105/odrawtools/odrawtools_libhmac.h.orig     2015-01-05 19:01:57.000000000 +0100
-+++ libodraw-20150105/odrawtools/odrawtools_libhmac.h  2015-01-23 22:35:15.718235511 +0100
-@@ -33,7 +33,7 @@
- #include <libhmac_support.h>
- #include <libhmac_types.h>
- 
--#elif defined( HAVE_LIBHMAC_H )
-+#else
- #include <libhmac.h>
- 
- #endif

diff --git a/libodraw-system-libs.patch b/libodraw-system-libs.patch
deleted file mode 100644 (file)
index 0bb6006..0000000
--- a/libodraw-system-libs.patch
+++ /dev/null
@@ -1,85 +0,0 @@
---- libodraw-20150105/configure.ac.orig        2015-01-23 18:09:56.162236924 +0100
-+++ libodraw-20150105/configure.ac     2015-01-23 18:11:42.702232453 +0100
-@@ -306,20 +306,7 @@ dnl Have configure make the Makefiles
- AC_CONFIG_FILES([Makefile])
- AC_CONFIG_FILES([include/Makefile])
- AC_CONFIG_FILES([common/Makefile])
--AC_CONFIG_FILES([libcstring/Makefile])
--AC_CONFIG_FILES([libcerror/Makefile])
--AC_CONFIG_FILES([libcthreads/Makefile])
--AC_CONFIG_FILES([libcdata/Makefile])
--AC_CONFIG_FILES([libclocale/Makefile])
--AC_CONFIG_FILES([libcnotify/Makefile])
--AC_CONFIG_FILES([libcsplit/Makefile])
--AC_CONFIG_FILES([libuna/Makefile])
--AC_CONFIG_FILES([libcfile/Makefile])
--AC_CONFIG_FILES([libcpath/Makefile])
--AC_CONFIG_FILES([libbfio/Makefile])
- AC_CONFIG_FILES([libodraw/Makefile])
--AC_CONFIG_FILES([libcsystem/Makefile])
--AC_CONFIG_FILES([libhmac/Makefile])
- AC_CONFIG_FILES([odrawtools/Makefile])
- AC_CONFIG_FILES([po/Makefile.in])
- AC_CONFIG_FILES([po/Makevars])
---- libodraw-20150105/Makefile.am.orig 2015-01-23 18:09:55.852236937 +0100
-+++ libodraw-20150105/Makefile.am      2015-01-23 18:12:07.965564727 +0100
-@@ -3,20 +3,7 @@ ACLOCAL_AMFLAGS = -I m4
- SUBDIRS = \
-       include \
-       common \
--      libcstring \
--      libcerror \
--      libcthreads \
--      libcdata \
--      libclocale \
--      libcnotify \
--      libcsplit \
--      libuna \
--      libcfile \
--      libcpath \
--      libbfio \
-       libodraw \
--      libcsystem \
--      libhmac \
-       odrawtools \
-       po \
-       manuals \
-@@ -68,17 +55,6 @@ lib: library
- 
- library:
-       (cd $(srcdir)/common && $(MAKE) $(AM_MAKEFLAGS))
--      (cd $(srcdir)/libcstring && $(MAKE) $(AM_MAKEFLAGS))
--      (cd $(srcdir)/libcerror && $(MAKE) $(AM_MAKEFLAGS))
--      (cd $(srcdir)/libcthreads && $(MAKE) $(AM_MAKEFLAGS))
--      (cd $(srcdir)/libcdata && $(MAKE) $(AM_MAKEFLAGS))
--      (cd $(srcdir)/libclocale && $(MAKE) $(AM_MAKEFLAGS))
--      (cd $(srcdir)/libcnotify && $(MAKE) $(AM_MAKEFLAGS))
--      (cd $(srcdir)/libcsplit && $(MAKE) $(AM_MAKEFLAGS))
--      (cd $(srcdir)/libuna && $(MAKE) $(AM_MAKEFLAGS))
--      (cd $(srcdir)/libcfile && $(MAKE) $(AM_MAKEFLAGS))
--      (cd $(srcdir)/libcpath && $(MAKE) $(AM_MAKEFLAGS))
--      (cd $(srcdir)/libbfio && $(MAKE) $(AM_MAKEFLAGS))
-       (cd $(srcdir)/libodraw && $(MAKE) $(AM_MAKEFLAGS))
-       (cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS))
- 
-@@ -95,20 +71,7 @@ distclean: clean
-       done && test -z "$$fail"
- 
- splint:
--      (cd $(srcdir)/libcstring && $(MAKE) splint $(AM_MAKEFLAGS))
--      (cd $(srcdir)/libcerror && $(MAKE) splint $(AM_MAKEFLAGS))
--      (cd $(srcdir)/libcthreads && $(MAKE) splint $(AM_MAKEFLAGS))
--      (cd $(srcdir)/libcdata && $(MAKE) splint $(AM_MAKEFLAGS))
--      (cd $(srcdir)/libclocale && $(MAKE) splint $(AM_MAKEFLAGS))
--      (cd $(srcdir)/libcnotify && $(MAKE) splint $(AM_MAKEFLAGS))
--      (cd $(srcdir)/libcsplit && $(MAKE) splint $(AM_MAKEFLAGS))
--      (cd $(srcdir)/libuna && $(MAKE) splint $(AM_MAKEFLAGS))
--      (cd $(srcdir)/libcfile && $(MAKE) splint $(AM_MAKEFLAGS))
--      (cd $(srcdir)/libcpath && $(MAKE) splint $(AM_MAKEFLAGS))
--      (cd $(srcdir)/libbfio && $(MAKE) splint $(AM_MAKEFLAGS))
-       (cd $(srcdir)/libodraw && $(MAKE) splint $(AM_MAKEFLAGS))
--      (cd $(srcdir)/libcsystem && $(MAKE) splint $(AM_MAKEFLAGS))
--      (cd $(srcdir)/libhmac && $(MAKE) splint $(AM_MAKEFLAGS))
-       (cd $(srcdir)/odrawtools && $(MAKE) splint $(AM_MAKEFLAGS))
-       (cd $(srcdir)/po && $(MAKE) splint $(AM_MAKEFLAGS))
-       (cd $(srcdir)/tests && $(MAKE) splint $(AM_MAKEFLAGS))

diff --git a/libodraw.spec b/libodraw.spec
index 5b8ec11f592c8817393cb6eaddc716960c00dd06..538e4a15d29e3ae14f703821a1f21c1eb8d06f17 100644 (file)
--- a/libodraw.spec
+++ b/libodraw.spec
@@ -1,52 +1,56 @@
+# see m4/${libname}.m4 />= for required version of particular library
+%define                libbfio_ver     20160108
+%define                libcdata_ver    20190112
+%define                libcerror_ver   20120425
+%define                libcfile_ver    20160409
+%define                libclocale_ver  20130406
+%define                libcnotify_ver  20120425
+%define                libcpath_ver    20180716
+%define                libcsplit_ver   20120701
+%define                libcthreads_ver 20160404
+%define                libhmac_ver     20160802
+%define                libuna_ver      20181006
 Summary:       Library to access optical disc (split) RAW formats
 Summary(pl.UTF-8):     Biblioteka służąca do dostępu do surowych (podzielonych) formatów dysków optycznych
 Name:          libodraw
-Version:       20150105
-Release:       2
+Version:       20190118
+Release:       1
 License:       LGPL v3+
 Group:         Libraries
-Source0:       https://github.com/libyal/libodraw/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 193b53914a854694c67972df61ba4a55
-Patch0:                %{name}-system-libs.patch
-Patch1:                %{name}-bison.patch
-Patch2:                %{name}-libhmac.patch
-Patch3:                %{name}-libcsystem.patch
+#Source0Download: https://github.com/libyal/libodraw/releases
+Source0:       https://github.com/libyal/libodraw/releases/download/%{version}/%{name}-alpha-%{version}.tar.gz
+# Source0-md5: 34e7ddfd40ddaaa76df1ebea729ce2f4
 URL:           https://github.com/libyal/libodraw/
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake >= 1.6
 BuildRequires: bison
 BuildRequires: flex
 BuildRequires: gettext-tools >= 0.18.1
-BuildRequires: libbfio-devel >= 20120426
-BuildRequires: libcdata-devel >= 20150102
-BuildRequires: libcerror-devel >= 20120425
-BuildRequires: libcfile-devel >= 20140503
-BuildRequires: libclocale-devel >= 20130406
-BuildRequires: libcnotify-devel >= 20120425
-BuildRequires: libcpath-devel >= 20120701
-BuildRequires: libcsplit-devel >= 20120701
-BuildRequires: libcstring-devel >= 20120425
-BuildRequires: libcsystem-devel >= 20141018
-BuildRequires: libcthreads-devel >= 20130509
-BuildRequires: libhmac-devel >= 20130714
-BuildRequires: libuna-devel >= 20120425
+BuildRequires: libbfio-devel >= %{libbfio_ver}
+BuildRequires: libcdata-devel >= %{libcdata_ver}
+BuildRequires: libcerror-devel >= %{libcerror_ver}
+BuildRequires: libcfile-devel >= %{libcfile_ver}
+BuildRequires: libclocale-devel >= %{libclocale_ver}
+BuildRequires: libcnotify-devel >= %{libcnotify_ver}
+BuildRequires: libcpath-devel >= %{libcpath_ver}
+BuildRequires: libcsplit-devel >= %{libcsplit_ver}
+BuildRequires: libcthreads-devel >= %{libcthreads_ver}
+BuildRequires: libhmac-devel >= %{libhmac_ver}
+BuildRequires: libuna-devel >= %{libuna_ver}
 BuildRequires: libtool
 BuildRequires: openssl-devel >= 1.0
 BuildRequires: pkgconfig
-BuildRequires: sed >= 4.0
-Requires:      libbfio >= 20120426
-Requires:      libcdata >= 20150102
-Requires:      libcerror >= 20120425
-Requires:      libcfile >= 20140503
-Requires:      libclocale >= 20130406
-Requires:      libcnotify >= 20120425
-Requires:      libcpath >= 20120701
-Requires:      libcsplit >= 20120701
-Requires:      libcstring >= 20120425
-Requires:      libcsystem >= 20141018
-Requires:      libcthreads >= 20130509
-Requires:      libhmac >= 20130714
-Requires:      libuna >= 20120425
+Requires:      libbfio >= %{libbfio_ver}
+Requires:      libcdata >= %{libcdata_ver}
+Requires:      libcerror >= %{libcerror_ver}
+Requires:      libcfile >= %{libcfile_ver}
+Requires:      libclocale >= %{libclocale_ver}
+Requires:      libcnotify >= %{libcnotify_ver}
+Requires:      libcpath >= %{libcpath_ver}
+Requires:      libcsplit >= %{libcsplit_ver}
+Requires:      libcthreads >= %{libcthreads_ver}
+Requires:      libhmac >= %{libhmac_ver}
+Requires:      libuna >= %{libuna_ver}
 Requires:      openssl >= 1.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -62,17 +66,16 @@ Summary:    Header files for libodraw library
 Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki libodraw
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
-Requires:      libbfio-devel >= 20120426
-Requires:      libcdata-devel >= 20150102
-Requires:      libcerror-devel >= 20120425
-Requires:      libcfile-devel >= 20140503
-Requires:      libclocale-devel >= 20130406
-Requires:      libcnotify-devel >= 20120425
-Requires:      libcpath-devel >= 20120701
-Requires:      libcsplit-devel >= 20120701
-Requires:      libcstring-devel >= 20120425
-Requires:      libcthreads-devel >= 20130509
-Requires:      libuna-devel >= 20120425
+Requires:      libbfio-devel >= %{libbfio_ver}
+Requires:      libcdata-devel >= %{libcdata_ver}
+Requires:      libcerror-devel >= %{libcerror_ver}
+Requires:      libcfile-devel >= %{libcfile_ver}
+Requires:      libclocale-devel >= %{libclocale_ver}
+Requires:      libcnotify-devel >= %{libcnotify_ver}
+Requires:      libcpath-devel >= %{libcpath_ver}
+Requires:      libcsplit-devel >= %{libcsplit_ver}
+Requires:      libcthreads-devel >= %{libcthreads_ver}
+Requires:      libuna-devel >= %{libuna_ver}
 
 %description devel
 Header files for libodraw library.
@@ -94,14 +97,9 @@ Statyczna biblioteka libodraw.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
 %{__gettextize}
-%{__sed} -i -e 's/ po\/Makefile.in//' configure.ac
 %{__libtoolize}
 %{__aclocal} -I m4
 %{__autoconf}