[tac_plus] [PATCH 2/9] Accommodate the directory and tarball not having plus in the name

Philip Prindeville philipp at redfish-solutions.com
Sat Dec 3 01:57:04 UTC 2016


From: Philip Prindeville <philipp at redfish-solutions.com>

The plus in the package name gets stripped out by the AC_INIT_PACKAGE
macro, and "tacacs+" is reduced to "tacacs".
---
 tacacs+.spec | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/tacacs+.spec b/tacacs+.spec
index 505ed249982b3223da8bb21e0044a37bb2418b68..e3be447fc4d7201e89261a8b0e9771578d30ef33 100644
--- a/tacacs+.spec
+++ b/tacacs+.spec
@@ -8,8 +8,11 @@ License: Cisco
 Packager: Bruce Carleton <bruce.carleton at jasperwireless.com>
 Vendor: Cisco
 
-Source: %{name}-%{version}.tar.gz
+%global name2 %(eval echo "%{name}" | %{__sed} -e 's/+$//')
+
+Source: %{name2}-%{version}.tar.gz
 Source2: tac_plus.sysvinit
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires: gcc, bison, flex, m4, pam-devel
@@ -17,8 +20,8 @@ Requires: pam
 
 %description
 
-%prep
-%setup
+%prep -n %{name2}-%{version}
+%setup -n %{name2}-%{version}
 
 
 %build
-- 
2.7.4



More information about the tac_plus mailing list