From e76203f8d37eee27159ba223cc42a0fd62b93552 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 17 Feb 2010 00:50:28 +0000 Subject: [PATCH 1/3] Initialize branch F-13 for afflib --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..baa94ef --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-13 From 618711f5a8fc0ce8fc4b79feb8cbf053f45920f4 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sun, 18 Apr 2010 20:33:06 +0000 Subject: [PATCH 2/3] - Update to 3.5.10 - Remove upstreamed patch --- .cvsignore | 2 +- afflib-3.4.1-pyver.patch | 22 ---------------------- afflib.spec | 8 +++++--- sources | 2 +- 4 files changed, 7 insertions(+), 27 deletions(-) delete mode 100644 afflib-3.4.1-pyver.patch diff --git a/.cvsignore b/.cvsignore index cd69df3..1aeb734 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -afflib-3.5.7.tar.gz +afflib-3.5.10.tar.gz diff --git a/afflib-3.4.1-pyver.patch b/afflib-3.4.1-pyver.patch deleted file mode 100644 index d5d0033..0000000 --- a/afflib-3.4.1-pyver.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up afflib-3.4.1/pyaff/Makefile.am.pyver afflib-3.4.1/pyaff/Makefile.am ---- afflib-3.4.1/pyaff/Makefile.am.pyver 2009-09-24 22:42:06.534805852 +0200 -+++ afflib-3.4.1/pyaff/Makefile.am 2009-09-24 22:45:13.306557135 +0200 -@@ -9,5 +9,5 @@ pyexec_LTLIBRARIES = pyaff.la - pyaff_la_SOURCES = pyaff.c - pyaff_la_LIBADD = ../lib/libafflib.la - pyaff_la_CPPFLAGS = $(PYTHON_CPPFLAGS) --pyaff_la_LDFLAGS = -module $(PYTHON_LDFLAGS) -+pyaff_la_LDFLAGS = -module -avoid-version $(PYTHON_LDFLAGS) - endif -diff -up afflib-3.4.1/pyaff/Makefile.in.pyver afflib-3.4.1/pyaff/Makefile.in ---- afflib-3.4.1/pyaff/Makefile.in.pyver 2009-09-24 08:08:53.000000000 +0200 -+++ afflib-3.4.1/pyaff/Makefile.in 2009-09-24 22:45:15.322807098 +0200 -@@ -226,7 +226,7 @@ EXTRA_DIST = PKG-INFO README pyaff.c set - @HAVE_PYTHON_TRUE@pyaff_la_SOURCES = pyaff.c - @HAVE_PYTHON_TRUE@pyaff_la_LIBADD = ../lib/libafflib.la - @HAVE_PYTHON_TRUE@pyaff_la_CPPFLAGS = $(PYTHON_CPPFLAGS) --@HAVE_PYTHON_TRUE@pyaff_la_LDFLAGS = -module $(PYTHON_LDFLAGS) -+@HAVE_PYTHON_TRUE@pyaff_la_LDFLAGS = -module -avoid-version $(PYTHON_LDFLAGS) - all: all-am - - .SUFFIXES: diff --git a/afflib.spec b/afflib.spec index 5cfe6cd..f6becdd 100644 --- a/afflib.spec +++ b/afflib.spec @@ -1,7 +1,7 @@ %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: afflib -Version: 3.5.7 +Version: 3.5.10 Release: 1%{?dist} Summary: Library to support the Advanced Forensic Format @@ -9,7 +9,6 @@ Group: System Environment/Libraries License: BSD with advertising URL: http://www.afflib.org Source0: http://www.afflib.org/downloads/afflib-%{version}.tar.gz -Patch1: afflib-3.4.1-pyver.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libtool @@ -59,7 +58,6 @@ developing applications that use %{name}. %prep %setup -q -%patch1 -p1 -b .pyver # prevent internal lzma to be built - testing #rm -rf lzma443 @@ -122,6 +120,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Apr 18 2010 Nicolas Chauvet - 3.5.10-1 +- Update to 3.5.10 +- Remove upstreamed patch + * Tue Jan 19 2010 Nicolas Chauvet - 3.5.7-1 - Update to 3.5.7 diff --git a/sources b/sources index bd5bb5d..d60d4c8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -efd1dacf1acf1ba450104635be93316c afflib-3.5.7.tar.gz +ae13d7eb04f9620ee92c9a697bd285f9 afflib-3.5.10.tar.gz From 628238214345c22f77501af7977e45302863d8f1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:37:18 +0000 Subject: [PATCH 3/3] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 1 - 4 files changed, 23 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index ae76bc3..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: afflib -# $Id: Makefile,v 1.1 2008/03/20 22:59:37 kevin Exp $ -NAME := afflib -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index baa94ef..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-13 diff --git a/import.log b/import.log deleted file mode 100644 index cc7876a..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -afflib-3_4_1-1_fc11:HEAD:afflib-3.4.1-1.fc11.src.rpm:1253825572