From edb3ad4ea8cf78dd1591faedc99731e23861551f Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Fri, 3 Mar 2017 11:59:19 +0100 Subject: [PATCH] Update to 3.7.15 --- .gitignore | 1 + 0001-Use-DESTDIR-for-packaging.patch | 24 +++++++++++++++++++++ afflib.spec | 31 ++++++++++++++-------------- sources | 2 +- 4 files changed, 42 insertions(+), 16 deletions(-) create mode 100644 0001-Use-DESTDIR-for-packaging.patch diff --git a/.gitignore b/.gitignore index 7df54f3..45806c9 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ afflib-3.5.12.tar.gz /afflib-3.6.15.tar.gz /v3.7.3.tar.gz /v3.7.4.tar.gz +/afflib-3.7.15.tar.gz diff --git a/0001-Use-DESTDIR-for-packaging.patch b/0001-Use-DESTDIR-for-packaging.patch new file mode 100644 index 0000000..3435f60 --- /dev/null +++ b/0001-Use-DESTDIR-for-packaging.patch @@ -0,0 +1,24 @@ +From 22a8229ad18248d85d11f85414ba6d1b740e62e8 Mon Sep 17 00:00:00 2001 +From: Nicolas Chauvet +Date: Fri, 3 Mar 2017 11:39:11 +0100 +Subject: [PATCH] Use DESTDIR for packaging + +--- + pyaff/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pyaff/Makefile.am b/pyaff/Makefile.am +index 468b0f7..4fa390b 100644 +--- a/pyaff/Makefile.am ++++ b/pyaff/Makefile.am +@@ -11,6 +11,6 @@ install-exec-local: + cd $(srcdir) && $(PYTHON) setup.py \ + build --build-base $(abs_builddir)/build \ + egg_info --egg-base $(abs_builddir) \ +- install --prefix $(prefix) --single-version-externally-managed --record=$(abs_builddir)/installed.txt \ ++ install --prefix $(DESTDIR)$(prefix) --single-version-externally-managed --record=$(abs_builddir)/installed.txt \ + bdist_egg --dist-dir $(abs_builddir)/dist + endif +-- +2.7.4 + diff --git a/afflib.spec b/afflib.spec index c307827..59a890f 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,14 +1,12 @@ -%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} - Name: afflib -Version: 3.7.4 -Release: 6%{?dist} +Version: 3.7.15 +Release: 1%{?dist} Summary: Library to support the Advanced Forensic Format -Group: System Environment/Libraries License: BSD with advertising -URL: https://github.com/simsong/AFFLIBv3 -Source0: https://github.com/simsong/AFFLIBv3/archive/v%{version}.tar.gz +URL: https://github.com/sshock/AFFLIBv3 +Source0: https://github.com/sshock/AFFLIBv3/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +Patch0: 0001-Use-DESTDIR-for-packaging.patch BuildRequires: libtool @@ -36,16 +34,14 @@ afflib is library for support of the Advanced Forensic Format (AFF). %package -n afftools Summary: Utilities for %{name} -Group: Applications/System -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description -n afftools The %{name}-utils package contains utilities for using %{name}. %package devel Summary: Development files for %{name} -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} Requires: openssl-devel Requires: pkgconfig @@ -58,6 +54,7 @@ developing applications that use %{name}. %setup -q -n AFFLIBv3-%{version} # prevent internal lzma to be built - testing #rm -rf lzma443 +%patch0 -p1 -b .destdir #fix spurious permissions with lzma443 find lzma443 -type f -exec chmod 0644 {} ';' @@ -93,14 +90,15 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %files -%doc AUTHORS BUGLIST.txt ChangeLog COPYING NEWS README -%doc doc/announce_2.2.txt +%doc AUTHORS BUGLIST.txt ChangeLog NEWS README +%doc doc/announce_2.2.txt +%license COPYING %{_libdir}/*.so.* %files -n afftools %{_bindir}/aff* -%{python_sitearch}/pyaff.so -%{_mandir}/man1/affcat.1.* +%{python_sitearch}/* +%{_mandir}/man1/aff*.1.* %files devel %doc doc/crypto_design.txt doc/crypto_doc.txt @@ -110,6 +108,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %changelog +* Fri Mar 03 2017 Nicolas Chauvet - 3.7.15-1 +- Update to 3.7.15 + * Fri Feb 10 2017 Fedora Release Engineering - 3.7.4-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index a736b56..5729690 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a81470590cfc2f22a3168f89ebe27ea6 v3.7.4.tar.gz +SHA512 (afflib-3.7.15.tar.gz) = 48fb3932a7889251df2b9777665ac0ae48aa19ae06180b2aa3820e12c23506d9742ae483ff538fcd5dcc60e6d540813fd59131e5f0ad98a829e6fcd55f87ce31