diff --git a/_service b/_service new file mode 100644 index 0000000..06de464 --- /dev/null +++ b/_service @@ -0,0 +1,14 @@ + + + git + https://github.com/libyal/libqcow + 3f7562bdcbc5074ee8003d9a3a13a2a24d4a2c58 + + 20210419 + + + *.tar + xz + + + diff --git a/libqcow-20210419.tar.xz b/libqcow-20210419.tar.xz new file mode 100644 index 0000000..f2c6bd4 --- /dev/null +++ b/libqcow-20210419.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e9b116f6e7fe052cf41eef797bd6a1bec1e1393330757ec2a51d35040139d178 +size 163928 diff --git a/libqcow-alpha-20201213.tar.gz b/libqcow-alpha-20201213.tar.gz deleted file mode 100644 index 0070e67..0000000 --- a/libqcow-alpha-20201213.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a2c70ca62cd559a342461ab51b60efd1e33605f0d8aad3163d67932c7b7258ae -size 1539028 diff --git a/libqcow.changes b/libqcow.changes index cdb0f3b..6a40ce9 100644 --- a/libqcow.changes +++ b/libqcow.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri May 14 22:08:34 UTC 2021 - Jan Engelhardt + +- Update to snapshot 20210419 (3f7562bd) + * No changelog was provided +- Add system-libs.patch + ------------------------------------------------------------------- Thu Dec 24 19:59:40 UTC 2020 - Greg Freemyer diff --git a/libqcow.spec b/libqcow.spec index df9a198..643434b 100644 --- a/libqcow.spec +++ b/libqcow.spec @@ -1,7 +1,7 @@ # # spec file for package libqcow # -# 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 @@ -17,35 +17,37 @@ %define lname libqcow1 -%define timestamp 20201213 Name: libqcow -Version: 0~%{timestamp} +Version: 20210419 Release: 0 Summary: Library and tooling to access the QEMU Copy-On-Write (QCOW) image format -License: LGPL-3.0-or-later AND GFDL-1.1-or-later AND GFDL-1.3-or-later +License: GFDL-1.1-or-later AND LGPL-3.0-or-later AND GFDL-1.3-or-later Group: Productivity/File utilities -URL: https://github.com/libyal/libqcow/wiki -Source: https://github.com/libyal/libqcow/releases/download/%timestamp/%{name}-alpha-%{timestamp}.tar.gz +URL: https://github.com/libyal/libqcow +Source: %{name}-%{version}.tar.xz Source2: QEMU_Copy-On-Write_file_format.pdf +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) >= 20130721 -BuildRequires: pkgconfig(libcaes) >= 20140731 -BuildRequires: pkgconfig(libcdata) >= 20140105 -BuildRequires: pkgconfig(libcerror) >= 20140105 -BuildRequires: pkgconfig(libcfile) >= 20130609 -BuildRequires: pkgconfig(libclocale) >= 20130609 -BuildRequires: pkgconfig(libcnotify) >= 20120425 -BuildRequires: pkgconfig(libcsplit) >= 20130609 -BuildRequires: pkgconfig(libcthreads) >= 20130723 -BuildRequires: pkgconfig(libfcache) >= 20120405 -BuildRequires: pkgconfig(libfdata) >= 20120405 -BuildRequires: pkgconfig(libuna) >= 20120425 +BuildRequires: pkgconfig(libbfio) >= 20201229 +BuildRequires: pkgconfig(libcaes) >= 20201012 +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(libuna) >= 20201204 BuildRequires: pkgconfig(openssl) >= 1.0 +BuildRequires: pkgconfig(python3) BuildRequires: pkgconfig(zlib) >= 1.2.5 -# using these packages from factory breaks the build, verified 2/25/2107 -#BuildRequires: pkgconfig(libcpath) > 20170108 -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Library and tooling to access the QEMU Copy-On-Write (QCOW) image format. @@ -96,7 +98,6 @@ in-image snapshots Summary: Tools to access the QEMU Copy-On-Write (QCOW) image format License: LGPL-3.0-or-later Group: Productivity/File utilities -Requires: %{lname} = %{version} %description tools Tools to access the QEMU Copy-On-Write (QCOW) image format. @@ -116,7 +117,7 @@ in-image snapshots %package devel Summary: Development files for libqcow -License: LGPL-3.0-or-later AND GFDL-1.1-or-later AND GFDL-1.3-or-later +License: GFDL-1.1-or-later AND LGPL-3.0-or-later AND GFDL-1.3-or-later Group: Development/Libraries/C and C++ Requires: %{lname} = %{version} @@ -130,47 +131,38 @@ applications that want to make use of libqcow. Summary: Python 3 bindings for libqcow License: LGPL-3.0-or-later Group: Development/Languages/Python -Requires: python3 -BuildRequires: pkgconfig(python3) -Requires: %{lname} = %{version} %description -n python3-%{name} Python 3 bindings for libqcow, which can access the QEMU Copy-On-Write (QCOW) image format %prep -%setup -q -n libqcow-%{timestamp} +%autosetup -p1 cp "%{SOURCE2}" . %build +if [ ! -e configure ]; then ./autogen.sh; fi %configure --disable-static --enable-wide-character-type --enable-python3 -make %{?_smp_mflags} +%make_build %install -make DESTDIR=%{buildroot} install %{?_smp_mflags} +%make_install find %{buildroot} -type f -name "*.la" -delete -print %post -n %{lname} -p /sbin/ldconfig - %postun -n %{lname} -p /sbin/ldconfig %files -n %{lname} -%defattr(-,root,root) -%doc AUTHORS ChangeLog -%license COPYING +%license COPYING* %{_libdir}/libqcow.so.* %files tools -%defattr(-,root,root) -%doc AUTHORS ChangeLog -%license COPYING +%license COPYING* %{_bindir}/qcow* %{_mandir}/man1/qcow*.1* %files devel -%defattr(-,root,root) -%doc AUTHORS README ChangeLog %doc QEMU_Copy-On-Write_file_format.pdf -%license COPYING +%license COPYING* %{_includedir}/libqcow.h %{_includedir}/libqcow/ %{_libdir}/libqcow.so @@ -178,9 +170,7 @@ find %{buildroot} -type f -name "*.la" -delete -print %{_mandir}/man3/libqcow.3* %files -n python3-%{name} -%defattr(-,root,root) -%doc AUTHORS README ChangeLog -%license COPYING +%license COPYING* %{python3_sitearch}/pyqcow.so %changelog diff --git a/system-libs.patch b/system-libs.patch new file mode 100644 index 0000000..233cc87 --- /dev/null +++ b/system-libs.patch @@ -0,0 +1,79 @@ +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 | 26 -------------------------- + configure.ac | 13 ------------- + 2 files changed, 39 deletions(-) + +Index: libqcow/Makefile.am +=================================================================== +--- libqcow.orig/Makefile.am ++++ libqcow/Makefile.am +@@ -3,19 +3,6 @@ ACLOCAL_AMFLAGS = -I m4 + SUBDIRS = \ + include \ + common \ +- libcerror \ +- libcthreads \ +- libcdata \ +- libclocale \ +- libcnotify \ +- libcsplit \ +- libuna \ +- libcfile \ +- libcpath \ +- libbfio \ +- libfcache \ +- libfdata \ +- libcaes \ + libqcow \ + qcowtools \ + pyqcow \ +@@ -78,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)/libcaes && $(MAKE) $(AM_MAKEFLAGS)) + (cd $(srcdir)/libqcow && $(MAKE) $(AM_MAKEFLAGS)) + (cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS)) + +Index: libqcow/configure.ac +=================================================================== +--- libqcow.orig/configure.ac ++++ libqcow/configure.ac +@@ -174,19 +174,6 @@ 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([libcaes/Makefile]) + AC_CONFIG_FILES([libqcow/Makefile]) + AC_CONFIG_FILES([pyqcow/Makefile]) + AC_CONFIG_FILES([pyqcow-python2/Makefile])