From ef42a04dd587585bf61d95041128ce9ff3511ae3 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Aug 18 2015 15:22:48 +0000 Subject: Fix py2_install macro - Cleanup spec --- diff --git a/epel-rpm-macros.spec b/epel-rpm-macros.spec index bfa095b..4322767 100644 --- a/epel-rpm-macros.spec +++ b/epel-rpm-macros.spec @@ -1,6 +1,6 @@ Name: epel-rpm-macros Version: 7 -Release: 2 +Release: 3 Summary: Extra Packages for Enterprise Linux RPM macros Group: System Environment/Base @@ -21,32 +21,25 @@ This package contains the Extra Packages for Enterprise Linux (EPEL) RPM macros for building EPEL packages. %prep -install -pm 644 %{SOURCE0} . install -pm 644 %{SOURCE1} . -%build - - %install -rm -rf $RPM_BUILD_ROOT - #GPG Key install -Dpm 644 %{SOURCE0} \ $RPM_BUILD_ROOT/usr/lib/rpm/macros.d/macros.epel-rpm-macros -%clean -rm -rf $RPM_BUILD_ROOT - %files -%defattr(-,root,root,-) -%doc GPL +%license GPL /usr/lib/rpm/macros.d/macros.epel-rpm-macros %changelog +* Tue Aug 18 2015 Orion Poplawski 7-3 +- Fix py2_install macro +- Cleanup spec + * Sat Aug 01 2015 Kevin Fenzi 7-2 - Add python macros. Fixes bug #1241655 * Wed Apr 29 2015 Kevin Fenzi 7-1 - Initial version for epel. - diff --git a/macros.epel-rpm-macros b/macros.epel-rpm-macros index 2e3fdc3..0972b1e 100644 --- a/macros.epel-rpm-macros +++ b/macros.epel-rpm-macros @@ -71,3 +71,4 @@ CFLAGS="%{optflags}" %{__python2} %{py_setup} %{?py_setup_args} build --executab %py2_install() %{expand:\ CFLAGS="%{optflags}" %{__python2} %{py_setup} %{?py_setup_args} install -O1 --skip-build --root %{buildroot} %{?1}\ +}