diff --git a/.gitignore b/.gitignore index 7df54f3..e933098 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,5 @@ 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 +/afflib-3.7.16.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 4851dc2..1809b7a 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,14 +1,11 @@ -%{!?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: 1%{?dist} +Version: 3.7.16 +Release: 3%{?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 BuildRequires: libtool @@ -21,7 +18,7 @@ BuildRequires: expat-devel BuildRequires: ncurses-devel BuildRequires: libtermcap-devel BuildRequires: openssl-devel -BuildRequires: python-devel +BuildRequires: python2-devel # GPLv2 FOSS incompatible with BSD with advertising ##BuildRequires: readline-devel #BuildRequires: libedit-devel - good replacement for readline - not supported for now @@ -36,16 +33,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 @@ -93,14 +88,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 +106,43 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 3.7.16-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Tue Feb 06 2018 Iryna Shcherbina - 3.7.16-2 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + +* Mon Jan 08 2018 Nicolas Chauvet - 3.7.16-1 +- Update to 3.7.16 + +* Wed Aug 02 2017 Fedora Release Engineering - 3.7.15-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 3.7.15-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Mon May 15 2017 Fedora Release Engineering - 3.7.15-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild + +* 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 + +* Tue Jul 19 2016 Fedora Release Engineering - 3.7.4-5 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + +* Wed Feb 03 2016 Fedora Release Engineering - 3.7.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Tue Jun 16 2015 Fedora Release Engineering - 3.7.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sat May 02 2015 Kalev Lember - 3.7.4-2 +- Rebuilt for GCC 5 C++11 ABI change + * Sun Jan 04 2015 Nicolas Chauvet - 3.7.4-1 - Update to 3.7.4 - cleanup spec file diff --git a/sources b/sources index a736b56..d8f0933 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a81470590cfc2f22a3168f89ebe27ea6 v3.7.4.tar.gz +SHA512 (afflib-3.7.16.tar.gz) = 19eb77d25f939e0bc941cc4106809e23a89f3f07fd0ddb8dfb03b2ddfa24e22c544deb011a5e4247a955529289de0e7ffc4b196c943f8cc352525fcc2b05a279