diff --git a/python3-rpm.spec b/python3-rpm.spec index a78e9c5..35e4a81 100644 --- a/python3-rpm.spec +++ b/python3-rpm.spec @@ -1,7 +1,7 @@ # # spec file for package python3-rpm # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 diff --git a/rpm-python.spec b/rpm-python.spec index 6b8e58c..919dcc5 100644 --- a/rpm-python.spec +++ b/rpm-python.spec @@ -1,7 +1,7 @@ # # spec file for package rpm-python # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 diff --git a/rpm.changes b/rpm.changes index dea93a4..38b5390 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Fri Feb 27 12:21:40 UTC 2015 - coolo@suse.com + +- apply db.diff from the subdir to avoid patching through a symlink + (to please new patch) +- comment gcc-PIE for now + +------------------------------------------------------------------- +Fri Feb 20 12:26:17 UTC 2015 - meissner@suse.com + +- add gcc-PIE to requires of rpm-build to make PIE building + default. bsc#912298 + ------------------------------------------------------------------- Sun Nov 30 02:59:00 UTC 2014 - Led diff --git a/rpm.spec b/rpm.spec index 4f939fc..e77d8d5 100644 --- a/rpm.spec +++ b/rpm.spec @@ -1,7 +1,7 @@ # # spec file for package rpm # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -176,6 +176,7 @@ Requires: file Requires: findutils Requires: gawk Requires: gcc +#Requires: gcc-PIE Requires: gettext-tools Requires: glibc-devel Requires: glibc-locale @@ -206,10 +207,13 @@ rm -rf beecrypt tar xjf %{SOURCE10} tar xjf %{SOURCE11} ln -s db-4.8.30 db +cd db +%patch2 -p1 +cd .. ln -s beecrypt-4.1.2 beecrypt chmod -R u+w db/* rm -f rpmdb/db.h -%patch -P 1 -P 2 +%patch -P 1 %patch3 -p1 %patch -P 11 -P 12 -P 13 -P 14 -P 15 -P 16 -P 17 -P 18 -P 19 %patch -P 20 -P 21 -P 24 -P 25 -P 26 -P 27 -P 28 -P 29