From 1f9c2e1cdac0d96f7a57e89639a3249dddca330a Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Aug 10 2016 20:05:50 +0000 Subject: Fix some syntax issues I introduced by mkstake. --- diff --git a/epel-rpm-macros.spec b/epel-rpm-macros.spec index ad35d01..c4d9cf7 100644 --- a/epel-rpm-macros.spec +++ b/epel-rpm-macros.spec @@ -1,6 +1,6 @@ Name: epel-rpm-macros Version: 5 -Release: 4 +Release: 5 Summary: Extra Packages for Enterprise Linux RPM macros Group: System Environment/Base @@ -50,6 +50,10 @@ rm -rf %{buildroot} /etc/rpm/macros.zzz-epel-python %changelog +* Wed Aug 10 2016 Jason L Tibbitts III - 5-5 +- Oops, remove some mess that was supposed to make vim happier but which + instead broke everything. + * Tue Aug 09 2016 Jason L Tibbitts III - 5-4 - Add %%python macros pulled back from EPEL6. EL5 doesn't define anything other than %%__python. diff --git a/macros.zzz-epel b/macros.zzz-epel index 47d7d1f..9303033 100644 --- a/macros.zzz-epel +++ b/macros.zzz-epel @@ -30,7 +30,7 @@ else trace = 1 end -}# +}%nil # Initializes global lua state and then undefines itself. # Should be called before or as part of any macros below this one. @@ -118,7 +118,7 @@ end \ rpm.define("epel_macros_init %{nil}") -}# +}%nil # ================ @@ -199,7 +199,7 @@ \ -- The next call to this macro should skip all the work did_description = 1 -}# +}%nil # ================ # Add the usual buildroot cleaning to the very beginning of %install @@ -207,7 +207,7 @@ db("In %install.") print("%install\\n") print(rpm.expand("rm -rf %{buildroot}\\n")) -}# +}%nil # Add a directory for RPM macros that can be used consistently across Fedora and EPEL %rpmmacrodir %{_sysconfdir}/rpm @@ -228,7 +228,7 @@ for i,v in ipairs(sources) do db("Found source: " .. v) end -}# +}%nil %el5_setup_patches() %{lua: maxcheck = getval("el5_patches_limit") @@ -238,6 +238,6 @@ for i,v in ipairs(patches) do db("Found patch: " .. v) end -}# +}%nil # vim: set filetype=spec: