diff --git a/libesedb.changes b/libesedb.changes index 4a91287..ec83749 100644 --- a/libesedb.changes +++ b/libesedb.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) + ------------------------------------------------------------------- Mon Aug 29 09:30:38 UTC 2022 - Jan Engelhardt diff --git a/libesedb.spec b/libesedb.spec index 63321c3..b0aabdc 100644 --- a/libesedb.spec +++ b/libesedb.spec @@ -30,11 +30,8 @@ Source3: Extensible_Storage_Engine_ESE_Database_File_EDB_format.pdf Source4: Forensic_analysis_of_the_Windows_Search_database.pdf Source5: Windows_Search.pdf Source6: libesedb-libfdata.pdf -Patch1: system-libs.patch BuildRequires: %{python_module devel} BuildRequires: c_compiler -BuildRequires: gettext-tools >= 0.21 -BuildRequires: libtool BuildRequires: python-rpm-macros BuildRequires: pkgconfig(libbfio) >= 20220120 BuildRequires: pkgconfig(libcdata) >= 20220115 @@ -46,7 +43,7 @@ BuildRequires: pkgconfig(libcpath) >= 20220108 BuildRequires: pkgconfig(libcsplit) >= 20220109 BuildRequires: pkgconfig(libcthreads) >= 20220102 BuildRequires: pkgconfig(libfcache) >= 20220110 -BuildRequires: pkgconfig(libfdata) >= 20211023 +BuildRequires: pkgconfig(libfdata) >= 20220111 BuildRequires: pkgconfig(libfdatetime) >= 20220112 BuildRequires: pkgconfig(libfguid) >= 20220113 BuildRequires: pkgconfig(libfmapi) >= 20220114 @@ -55,9 +52,12 @@ BuildRequires: pkgconfig(libfwnt) >= 20210906 BuildRequires: pkgconfig(libmapidb) >= 20210421 BuildRequires: pkgconfig(libuna) >= 20220611 %python_subpackages +# Various notes: https://en.opensuse.org/libyal %description -Library and tools to access the Extensible Storage Engine (ESE) Database File (EDB) format. ESEDB is used in may different applications like Windows Search, Windows Mail, Exchange, Active Directory, etc. +Library and tools to access the Extensible Storage Engine (ESE) Database File +(EDB) format. ESEDB is used in may different applications like Windows Search, +Windows Mail, Exchange, Active Directory, etc. %package -n %{lname} Summary: Library to access the EDB format @@ -65,7 +65,9 @@ License: LGPL-3.0-or-later Group: System/Libraries %description -n %{lname} -Library to access the Extensible Storage Engine (ESE) Database File (EDB) format. ESEDB is used in may different applications like Windows Search, Windows Mail, Exchange, Active Directory, etc. +Library to access the Extensible Storage Engine (ESE) Database File (EDB) +format. ESEDB is used in may different applications like Windows Search, +Windows Mail, Exchange, Active Directory, etc. %package tools Summary: Tools to access the EDB format @@ -73,7 +75,9 @@ License: LGPL-3.0-or-later Group: Productivity/File utilities %description tools -Tools to access the Extensible Storage Engine (ESE) Database File (EDB) format. ESEDB is used in may different applications like Windows Search, Windows Mail, Exchange, Active Directory, etc. +Tools to access the Extensible Storage Engine (ESE) Database File (EDB) format. +ESEDB is used in may different applications like Windows Search, Windows Mail, +Exchange, Active Directory, etc. %package devel Summary: Development files for libesedb, a EDB file format library @@ -90,22 +94,15 @@ applications that want to make use of libesedb. %prep %autosetup -p1 -cp "%{SOURCE2}" . -cp "%{SOURCE3}" . -cp "%{SOURCE4}" . -cp "%{SOURCE5}" . -cp "%{SOURCE6}" . +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 bc92759..0000000 --- a/system-libs.patch +++ /dev/null @@ -1,97 +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 | 34 ---------------------------------- - configure.ac | 18 ------------------ - 2 files changed, 52 deletions(-) - -Index: libesedb/Makefile.am -=================================================================== ---- libesedb.orig/Makefile.am -+++ libesedb/Makefile.am -@@ -3,25 +3,7 @@ ACLOCAL_AMFLAGS = -I m4 - SUBDIRS = \ - include \ - common \ -- libcerror \ -- libcthreads \ -- libcdata \ -- libclocale \ -- libcnotify \ -- libcsplit \ -- libuna \ -- libcfile \ -- libcpath \ -- libbfio \ -- libfcache \ -- libfdata \ -- libfdatetime \ -- libfguid \ -- libfvalue \ -- libfwnt \ - libesedb \ -- libfmapi \ -- libmapidb \ - esedbtools \ - pyesedb \ - pyesedb-python2 \ -@@ -83,22 +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)/libfdatetime && $(MAKE) $(AM_MAKEFLAGS)) -- (cd $(srcdir)/libfguid && $(MAKE) $(AM_MAKEFLAGS)) -- (cd $(srcdir)/libfvalue && $(MAKE) $(AM_MAKEFLAGS)) -- (cd $(srcdir)/libfwnt && $(MAKE) $(AM_MAKEFLAGS)) - (cd $(srcdir)/libesedb && $(MAKE) $(AM_MAKEFLAGS)) - (cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS)) - -Index: libesedb/configure.ac -=================================================================== ---- libesedb.orig/configure.ac -+++ libesedb/configure.ac -@@ -182,28 +182,10 @@ 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([libfdatetime/Makefile]) --AC_CONFIG_FILES([libfguid/Makefile]) --AC_CONFIG_FILES([libfvalue/Makefile]) --AC_CONFIG_FILES([libfwnt/Makefile]) - AC_CONFIG_FILES([libesedb/Makefile]) - AC_CONFIG_FILES([pyesedb/Makefile]) - AC_CONFIG_FILES([pyesedb-python2/Makefile]) - AC_CONFIG_FILES([pyesedb-python3/Makefile]) --AC_CONFIG_FILES([libfmapi/Makefile]) --AC_CONFIG_FILES([libmapidb/Makefile]) - AC_CONFIG_FILES([esedbtools/Makefile]) - AC_CONFIG_FILES([po/Makefile.in]) - AC_CONFIG_FILES([po/Makevars])