From e8e40abe4ebd3fd9004965a2fd721dd30c5a98090c87e784516b60c63fe3591f Mon Sep 17 00:00:00 2001 From: Greg Freemyer Date: Wed, 3 Feb 2016 20:30:20 +0000 Subject: [PATCH] Accepting request 357615 from home:gregfreemyer:Tools-for-forensic-boot-cd Fix recent compile failure OBS-URL: https://build.opensuse.org/request/show/357615 OBS-URL: https://build.opensuse.org/package/show/security:forensics/libfsntfs?expand=0&rev=5 --- libfsntfs.changes | 6 ++++ libfsntfs.spec | 83 ++++++++++++++++++++++++----------------------- 2 files changed, 48 insertions(+), 41 deletions(-) diff --git a/libfsntfs.changes b/libfsntfs.changes index 5344cbf..6bad456 100644 --- a/libfsntfs.changes +++ b/libfsntfs.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Feb 3 20:16:14 UTC 2016 - Greg.Freemyer@gmail.com + +- use internal libfdata. Builds began failing with the recent update of numerous libyal packages +- run through spec-cleaner + ------------------------------------------------------------------- Tue Jan 26 03:09:55 UTC 2016 - Greg.Freemyer@gmail.com diff --git a/libfsntfs.spec b/libfsntfs.spec index 555b88c..89ee71f 100644 --- a/libfsntfs.spec +++ b/libfsntfs.spec @@ -1,7 +1,7 @@ # # spec file for package libfsntfs # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,39 +16,39 @@ # -Name: libfsntfs %define lname libfsntfs1 %define timestamp 20151130 -Version: 0~%timestamp +Name: libfsntfs +Version: 0~%{timestamp} Release: 0 Summary: Library and tools to access the NTFS filesystem License: LGPL-3.0+ and GFDL-1.3+ Group: Productivity/File utilities Url: https://github.com/libyal/libfsntfs/wiki -Source: https://github.com/libyal/libfsntfs/releases/download/%timestamp/%name-experimental-%timestamp.tar.gz +Source: https://github.com/libyal/libfsntfs/releases/download/%{timestamp}/%{name}-experimental-%{timestamp}.tar.gz BuildRequires: pkg-config BuildRequires: python-devel -BuildRequires: pkgconfig(libclocale) >= 20130609 -BuildRequires: pkgconfig(libuna) >= 20120425 -BuildRequires: pkgconfig(libfguid) >= 20130904 BuildRequires: pkgconfig(libbfio) >= 20130721 BuildRequires: pkgconfig(libcdata) >= 20130904 BuildRequires: pkgconfig(libcfile) >= 20130609 +BuildRequires: pkgconfig(libclocale) >= 20130609 BuildRequires: pkgconfig(libcnotify) >= 20130609 BuildRequires: pkgconfig(libcpath) >= 20130609 BuildRequires: pkgconfig(libcsplit) >= 20130609 BuildRequires: pkgconfig(libcsystem) >= 20120425 +BuildRequires: pkgconfig(libcthreads) +BuildRequires: pkgconfig(libfcache) BuildRequires: pkgconfig(libfdatetime) >= 20130317 -BuildRequires: pkgconfig(libcthreads) -BuildRequires: pkgconfig(libfcache) -BuildRequires: pkgconfig(libfdata) -BuildRequires: pkgconfig(libfwnt) -#as of Dec 2, 2015, the various released versions of the below all cause compile errors. +BuildRequires: pkgconfig(libfguid) >= 20130904 +BuildRequires: pkgconfig(libfwnt) +BuildRequires: pkgconfig(libuna) >= 20120425 +#as of Feb 2, 2016, the various released versions of the below all cause compile errors. # libcerror and libcstring are examples of very fundamental parts of libyal, but the latest released version causes build errors here (12/2/2015). -#BuildRequires: pkgconfig(libcerror) > 20151201 -#BuildRequires: pkgconfig(libcstring) > 20151201 +#BuildRequires: pkgconfig(libcerror) > 20150407 +#BuildRequires: pkgconfig(libcstring) > 20150101 +#BuildRequires: pkgconfig(libfdata) #not yet in OBS -#BuildRequires: pkgconfig(libfusn) +#BuildRequires: pkgconfig(libfusn) BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -56,12 +56,12 @@ Library and tools to access the New Technology File System (NTFS). Note that this project currently only focuses on the analysis of the format. -%package -n %lname +%package -n %{lname} Summary: Library to access the New Technology File System (NTFS). License: LGPL-3.0+ Group: System/Libraries -%description -n %lname +%description -n %{lname} libfsntfs is a library to access the New Technology File System (NTFS). Note that this project currently only focuses on the analysis of the format. @@ -73,67 +73,68 @@ Group: Productivity/File utilities %description tools libfsntfs-tools is a project to access the NTFS filesystem - + Note that this project currently only focuses on the analysis of the format. %package devel Summary: Development files for libfsntfs License: LGPL-3.0+ and GFDL-1.3+ Group: Development/Libraries/C and C++ -Requires: %lname = %version +Requires: %{lname} = %{version} %description devel -%name is a library to access the New Technology File System (NTFS). +%{name} is a library to access the New Technology File System (NTFS). This subpackage contains libraries and header files for developing -applications that want to make use of %name. +applications that want to make use of %{name}. -%package -n python-%name +%package -n python-%{name} Summary: Python bindings for libfsntfs License: LGPL-3.0+ Group: Development/Libraries/Python -Requires: %lname = %version +Requires: %{lname} = %{version} Requires: python -Provides: pyfsntfs = %version +Provides: pyfsntfs = %{version} -%description -n python-%name +%description -n python-%{name} Python binding for libfsntfs, which can access the NTFS filesystem. %prep -%setup -qn libfsntfs-%timestamp +%setup -q -n libfsntfs-%{timestamp} %build %configure --disable-static --enable-wide-character-type --enable-python make %{?_smp_mflags} %install -make install DESTDIR="%buildroot" -find %buildroot -name '*.la' -delete +make DESTDIR=%{buildroot} install %{?_smp_mflags} +find %{buildroot} -type f -name "*.la" -delete -print -%post -n %lname -p /sbin/ldconfig -%postun -n %lname -p /sbin/ldconfig +%post -n %{lname} -p /sbin/ldconfig -%files -n %lname +%postun -n %{lname} -p /sbin/ldconfig + +%files -n %{lname} %defattr(-,root,root) %doc AUTHORS COPYING ChangeLog -%_libdir/libfsntfs.so.* +%{_libdir}/libfsntfs.so.* %files tools %defattr(-,root,root) -%_bindir/fsntfs* -%_mandir/man1/fsntfsinfo.1* +%{_bindir}/fsntfs* +%{_mandir}/man1/fsntfsinfo.1* %files devel %defattr(-,root,root) -%_includedir/libfsntfs.h -%_includedir/libfsntfs/ -%_libdir/libfsntfs.so -%_libdir/pkgconfig/libfsntfs.pc -%_mandir/man3/libfsntfs.3* +%{_includedir}/libfsntfs.h +%{_includedir}/libfsntfs/ +%{_libdir}/libfsntfs.so +%{_libdir}/pkgconfig/libfsntfs.pc +%{_mandir}/man3/libfsntfs.3* -%files -n python-%name +%files -n python-%{name} %defattr(-,root,root) %doc AUTHORS COPYING README -%python_sitearch/pyfsntfs.so +%{python_sitearch}/pyfsntfs.so %changelog