Accepting request 347892 from home:michel_mno:branches:devel:tools

- add Conflicts with prelink package
  and fix rpmlint warnings need commented macros with double %%

OBS-URL: https://build.opensuse.org/request/show/347892
OBS-URL: https://build.opensuse.org/package/show/devel:tools/execstack?expand=0&rev=3
This commit is contained in:
OBS User michel_mno
2015-12-08 10:43:02 +00:00
committed by Git OBS Bridge
parent d175d8d94f
commit c5eba19592
2 changed files with 11 additions and 4 deletions

View File

@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Dec 8 08:48:00 UTC 2015 - normand@linux.vnet.ibm.com
- add Conflicts with prelink package
and fix rpmlint warnings need commented macros with double %%
-------------------------------------------------------------------
Tue Dec 1 08:47:54 UTC 2015 - normand@linux.vnet.ibm.com

View File

@@ -23,14 +23,14 @@ Summary: Utility to set/clear/query executable stack bit
%global commit 4c79120bcdbde0616f592458ccde7035e92ca3d8
%global shortcommit 4c79120
#global shortcommit %(c=%{commit}; echo ${c:0:7})
# do not use dynamic shotcommit, Source0 with git format and autosetup
#global shortcommit %%(c=%%{commit}; echo ${c:0:7})
# do not use dynamic shortcommit, Source0 with git format and autosetup
# because "osc service localrun source_validator" would report error
License: GPL-2.0+
Url: https://github.com/keszybz/prelink/archive
Source0: prelink-%{shortcommit}.tar.gz
#ource0: https://github.com/keszybz/prelink/archive/%{commit}.tar.gz#/prelink-%{shortcommit}.tar.gz
#ource0: https://github.com/keszybz/prelink/archive/%%{commit}.tar.gz#/prelink-%%{shortcommit}.tar.gz
Patch0: Add-PL_ARCH-for-AArch64.patch
Patch1: prelink_update_fsf_address.patch
@@ -42,6 +42,7 @@ BuildRequires: libselinux-devel, selinux-tools
BuildRequires: git
Requires: glibc >= 2.2.4-18, coreutils, findutils
Requires: util-linux, gawk, grep
Conflicts: prelink <= %{version}
%description
This package is built from prelink sources but contains just the
@@ -49,7 +50,7 @@ execstack binary. It can be used manipulate ELF binaries to run
with or without executable stack.
%prep
#autosetup -n prelink-%{commit} -p1 -Sgit
#autosetup -n prelink-%%{commit} -p1 -Sgit
%setup -q -n prelink-%{commit}
%patch0 -p1
%patch1 -p1