diff --git a/libvhdi.changes b/libvhdi.changes index a14ded5..d48fa09 100644 --- a/libvhdi.changes +++ b/libvhdi.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Nov 26 16:43:24 UTC 2022 - Jan Engelhardt + +- Delete system-libs.patch (not needed - system libs are + autodetected) + ------------------------------------------------------------------- Thu Nov 24 11:45:18 UTC 2022 - Jan Engelhardt diff --git a/libvhdi.spec b/libvhdi.spec index 2a54666..2d27e47 100644 --- a/libvhdi.spec +++ b/libvhdi.spec @@ -28,7 +28,6 @@ Source: https://github.com/libyal/libvhdi/releases/download/%version/lib Source2: https://github.com/libyal/libvhdi/releases/download/%version/libvhdi-alpha-%version.tar.gz.asc Source3: %name.keyring Source8: Virtual_Hard_Disk_VHD_image_format.pdf -Patch1: system-libs.patch BuildRequires: %{python_module devel} BuildRequires: c_compiler BuildRequires: gettext-tools >= 0.21 @@ -49,19 +48,21 @@ BuildRequires: pkgconfig(libfdata) >= 20220111 BuildRequires: pkgconfig(libfguid) >= 20220113 BuildRequires: pkgconfig(libuna) >= 20220611 %python_subpackages +# Various notes: https://en.opensuse.org/libyal %description Library and tools to access the Virtual Hard Disk (VHD) image format. -Read supported formats: +Read-supported formats: + +* VHD version 1 -VHD version 1 Supported image types: -Fixed-size hard disk image -Dynamic-size (or sparse) hard disk image -Differential (or differencing) hard disk image -Note that an undo disk image (.vud) is also a differential image +* Fixed-size hard disk image +* Dynamic-size (or sparse) hard disk image +* Differential (or differencing) hard disk image +* Note that an undo disk image (.vud) is also a differential image %package -n %{lname} Summary: Library to access the VHD image format @@ -71,15 +72,16 @@ Group: System/Libraries %description -n %{lname} Library to access the Virtual Hard Disk (VHD) image format. -Read supported formats: +Read-supported formats: + +* VHD version 1 -VHD version 1 Supported image types: -Fixed-size hard disk image -Dynamic-size (or sparse) hard disk image -Differential (or differencing) hard disk image -Note that an undo disk image (.vud) is also a differential image +* Fixed-size hard disk image +* Dynamic-size (or sparse) hard disk image +* Differential (or differencing) hard disk image +* Note that an undo disk image (.vud) is also a differential image %package tools Summary: Tools to access the VHD image format @@ -107,14 +109,13 @@ cp %_sourcedir/*.pdf . %build autoreconf -fi -# OOT builds are presently broken, so we have to install -# within each python iteration now, not in %%install. %{python_expand # # see libcdata for version-sc echo "V_%version { global: *; };" >v.sym %configure --disable-static --enable-wide-character-type \ --enable-python PYTHON_VERSION="%{$python_bin_suffix}" \ LDFLAGS="-Wl,--version-script=$PWD/v.sym" +grep ' '' ''local' config.log && exit 1 %make_build %make_install DESTDIR="%_builddir/rt" %make_build clean diff --git a/system-libs.patch b/system-libs.patch deleted file mode 100644 index bae2a0b..0000000 --- a/system-libs.patch +++ /dev/null @@ -1,79 +0,0 @@ -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: libvhdi/Makefile.am -=================================================================== ---- libvhdi.orig/Makefile.am -+++ libvhdi/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 \ -- libfguid \ - libvhdi \ - vhditools \ - pyvhdi \ -@@ -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)/libfguid && $(MAKE) $(AM_MAKEFLAGS)) - (cd $(srcdir)/libvhdi && $(MAKE) $(AM_MAKEFLAGS)) - (cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS)) - -Index: libvhdi/configure.ac -=================================================================== ---- libvhdi.orig/configure.ac -+++ libvhdi/configure.ac -@@ -170,19 +170,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([libfguid/Makefile]) - AC_CONFIG_FILES([libvhdi/Makefile]) - AC_CONFIG_FILES([pyvhdi/Makefile]) - AC_CONFIG_FILES([pyvhdi-python2/Makefile])