From 1000fe4b0ac7a2d7741b43fedb40be7d54450e59 Mon Sep 17 00:00:00 2001
From: "Aaron D. Marasco" <amarasco@vsi-corp.com>
Date: Fri, 11 Sep 2015 12:05:23 -0400
Subject: Use location macros

Fixes %files bug when prefix is not "/usr"
---
 patchelf.spec.in | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/patchelf.spec.in b/patchelf.spec.in
index f9cd198..91940a2 100644
--- a/patchelf.spec.in
+++ b/patchelf.spec.in
@@ -27,12 +27,12 @@ make check
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
-strip $RPM_BUILD_ROOT/%{_prefix}/bin/* || true
+# rpmbuild automatically strips... strip $RPM_BUILD_ROOT/%{_bindir}/* || true
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
-/usr/bin/patchelf
-/usr/share/doc/patchelf/README
-/usr/share/man/man1/patchelf.1.gz
+%{_bindir}/patchelf
+%doc %{_docdir}/patchelf/README
+%{_mandir}/man1/patchelf.1.gz
-- 
cgit v0.12


From cb5b5eae8217b4df018c675cbd5dcc968ed1ca73 Mon Sep 17 00:00:00 2001
From: "Aaron D. Marasco" <amarasco@vsi-corp.com>
Date: Fri, 11 Sep 2015 12:19:38 -0400
Subject: Less autotools, more RPM. Also escaped commented out %.

---
 patchelf.spec.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/patchelf.spec.in b/patchelf.spec.in
index 91940a2..a361554 100644
--- a/patchelf.spec.in
+++ b/patchelf.spec.in
@@ -6,8 +6,8 @@ Release: 1
 License: GPL
 Group: Development/Tools
 URL: http://nixos.org/patchelf.html
-Source0: %{name}-@PACKAGE_VERSION@.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{PACKAGE_VERSION}-buildroot
+Source0: %{name}-%{version}.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
 Prefix: /usr
 
 %description
@@ -27,7 +27,7 @@ make check
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
-# rpmbuild automatically strips... strip $RPM_BUILD_ROOT/%{_bindir}/* || true
+# rpmbuild automatically strips... strip $RPM_BUILD_ROOT/%%{_bindir}/* || true
 
 %clean
 rm -rf $RPM_BUILD_ROOT
-- 
cgit v0.12