diff --git a/_service b/_service new file mode 100644 index 0000000..e8b2ec2 --- /dev/null +++ b/_service @@ -0,0 +1,14 @@ + + + git + https://github.com/libyal/libsmraw + ad75680dc06df63304a54cd1fc683a1552a4854c + + 20210418 + + + *.tar + xz + + + diff --git a/libsmraw-20210418.tar.xz b/libsmraw-20210418.tar.xz new file mode 100644 index 0000000..b3b25e8 --- /dev/null +++ b/libsmraw-20210418.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1d26ce740395ff7e95eeeb413ae101fc463165f0ac7b25e7c8a91f816fb952e2 +size 151464 diff --git a/libsmraw-alpha-20201210.tar.gz b/libsmraw-alpha-20201210.tar.gz deleted file mode 100644 index 88fda68..0000000 --- a/libsmraw-alpha-20201210.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3b9db37e73a14820a6357cb986833a3c9214f603b4665ab198adb51643d4fd50 -size 1632623 diff --git a/libsmraw.changes b/libsmraw.changes index fdbcb5c..130563b 100644 --- a/libsmraw.changes +++ b/libsmraw.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri May 14 00:41:01 UTC 2021 - Jan Engelhardt + +- Update to snapshot 20210418 (ad75680d) + * No changelog was provided +- Add system-libs.patch + ------------------------------------------------------------------- Thu Dec 17 17:09:38 UTC 2020 - Greg Freemyer diff --git a/libsmraw.spec b/libsmraw.spec index 36ee0f3..a373bdf 100644 --- a/libsmraw.spec +++ b/libsmraw.spec @@ -1,7 +1,7 @@ # # spec file for package libsmraw # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,36 +18,36 @@ Name: libsmraw %define lname libsmraw1 -%define timestamp 20201210 -Version: 0~%timestamp +Version: 20210418 Release: 0 Summary: Library and tools to access the (split) RAW image format License: LGPL-3.0-or-later Group: Productivity/File utilities -URL: https://github.com/libyal/libsmraw/wiki -Source: https://github.com/libyal/libsmraw/releases/download/%timestamp/%name-alpha-%timestamp.tar.gz +URL: https://github.com/libyal/libsmraw +Source: %name-%version.tar.xz +Patch1: system-libs.patch +BuildRequires: c_compiler +BuildRequires: gettext-tools >= 0.18.1 +BuildRequires: libtool BuildRequires: pkg-config BuildRequires: pkgconfig(fuse) >= 2.6 -BuildRequires: pkgconfig(libbfio) >= 20120426 -BuildRequires: pkgconfig(libcdata) >= 20120425 -BuildRequires: pkgconfig(libcerror) >= 20170101 -BuildRequires: pkgconfig(libcfile) >= 20120526 -BuildRequires: pkgconfig(libclocale) >= 20120425 -BuildRequires: pkgconfig(libcnotify) >= 20120425 -BuildRequires: pkgconfig(libcpath) >= 20120701 -BuildRequires: pkgconfig(libcsplit) >= 20120701 -BuildRequires: pkgconfig(libcstring) >= 20150101 -BuildRequires: pkgconfig(libcsystem) >= 20120425 -BuildRequires: pkgconfig(libcthreads) >= 20120701 -BuildRequires: pkgconfig(libfcache) >= 20120425 -BuildRequires: pkgconfig(libfdata) >= 20120425 -BuildRequires: pkgconfig(libfvalue) >= 20120428 -BuildRequires: pkgconfig(libhmac) >= 20120425 -BuildRequires: pkgconfig(libuna) >= 20120425 +BuildRequires: pkgconfig(libbfio) >= 20201229 +BuildRequires: pkgconfig(libcdata) >= 20200509 +BuildRequires: pkgconfig(libcerror) >= 20201121 +BuildRequires: pkgconfig(libcfile) >= 20201229 +BuildRequires: pkgconfig(libclocale) >= 20200913 +BuildRequires: pkgconfig(libcnotify) >= 20200913 +BuildRequires: pkgconfig(libcpath) >= 20200623 +BuildRequires: pkgconfig(libcsplit) >= 20200703 +BuildRequires: pkgconfig(libcthreads) >= 20200508 +BuildRequires: pkgconfig(libfcache) >= 20200708 +BuildRequires: pkgconfig(libfdata) >= 20201129 +BuildRequires: pkgconfig(libfvalue) >= 20210510 +BuildRequires: pkgconfig(libhmac) >= 20200104 +BuildRequires: pkgconfig(libuna) >= 20201204 BuildRequires: pkgconfig(openssl) >= 1.0 BuildRequires: pkgconfig(python2) BuildRequires: pkgconfig(python3) -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description libsmraw is a library to access the storage media RAW format. @@ -91,28 +91,25 @@ Python 3 bindings for libsmraw, which provides functionality to work with (split) RAW files. %prep -%setup -qn libsmraw-%timestamp +%autosetup -p1 %build +if [ ! -e configure ]; then ./autogen.sh; fi %configure --disable-static --enable-wide-character-type --enable-python3 -make %{?_smp_mflags} +%make_build %install -make install DESTDIR="%buildroot" +%make_install find "%buildroot" -name "*.la" -delete %post -n %lname -p /sbin/ldconfig %postun -n %lname -p /sbin/ldconfig %files -n %lname -%defattr(-,root,root) -%doc AUTHORS ChangeLog %license COPYING %_libdir/libsmraw.so.1* %files devel -%defattr(-,root,root) -%doc AUTHORS ChangeLog %license COPYING %_includedir/libsmraw* %_libdir/libsmraw.so @@ -120,16 +117,12 @@ find "%buildroot" -name "*.la" -delete %_mandir/man3/libsmraw.3* %files tools -%defattr(-,root,root) -%doc AUTHORS ChangeLog %license COPYING %_bindir/smrawverify %_bindir/smrawmount %_mandir/man1/smrawmount.1* %files -n python3-%name -%defattr(-,root,root) -%doc AUTHORS ChangeLog %license COPYING %python3_sitearch/pysmraw.so diff --git a/system-libs.patch b/system-libs.patch new file mode 100644 index 0000000..5a630b9 --- /dev/null +++ b/system-libs.patch @@ -0,0 +1,87 @@ +From: Jan Engelhardt +Date: 2021-05-12 17:36:02.536572543 +0200 + +Some dirs are not present in snapshots directly generated from git +(nor are they marked as a submodule). Patch it out, since we have +them as system libs. +--- + Makefile.am | 27 --------------------------- + configure.ac | 14 -------------- + 2 files changed, 41 deletions(-) + +Index: libsmraw/Makefile.am +=================================================================== +--- libsmraw.orig/Makefile.am ++++ libsmraw/Makefile.am +@@ -3,21 +3,7 @@ ACLOCAL_AMFLAGS = -I m4 + SUBDIRS = \ + include \ + common \ +- libcerror \ +- libcthreads \ +- libcdata \ +- libclocale \ +- libcnotify \ +- libcsplit \ +- libuna \ +- libcfile \ +- libcpath \ +- libbfio \ +- libfcache \ +- libfdata \ +- libfvalue \ + libsmraw \ +- libhmac \ + smrawtools \ + smraw.net \ + pysmraw \ +@@ -79,19 +65,6 @@ lib: library + + library: + (cd $(srcdir)/common && $(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)/libfcache && $(MAKE) $(AM_MAKEFLAGS)) +- (cd $(srcdir)/libfdata && $(MAKE) $(AM_MAKEFLAGS)) +- (cd $(srcdir)/libfvalue && $(MAKE) $(AM_MAKEFLAGS)) + (cd $(srcdir)/libsmraw && $(MAKE) $(AM_MAKEFLAGS)) + (cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS)) + +Index: libsmraw/configure.ac +=================================================================== +--- libsmraw.orig/configure.ac ++++ libsmraw/configure.ac +@@ -173,25 +173,11 @@ dnl Generate Makefiles + AC_CONFIG_FILES([Makefile]) + AC_CONFIG_FILES([include/Makefile]) + AC_CONFIG_FILES([common/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([libfcache/Makefile]) +-AC_CONFIG_FILES([libfdata/Makefile]) +-AC_CONFIG_FILES([libfvalue/Makefile]) + AC_CONFIG_FILES([libsmraw/Makefile]) + AC_CONFIG_FILES([pysmraw/Makefile]) + AC_CONFIG_FILES([pysmraw-python2/Makefile]) + AC_CONFIG_FILES([pysmraw-python3/Makefile]) + AC_CONFIG_FILES([smraw.net/Makefile]) +-AC_CONFIG_FILES([libhmac/Makefile]) + AC_CONFIG_FILES([smrawtools/Makefile]) + AC_CONFIG_FILES([po/Makefile.in]) + AC_CONFIG_FILES([po/Makevars])