[racoon2] Prefix binaries with racoon2- (797810)
Pavel Šimerda
pavlix at fedoraproject.org
Mon Mar 5 13:50:46 UTC 2012
commit 290f213605cdfbdde137620a39e727a4d8c8bb5d
Author: Pavel Šimerda <pavlix at pavlix.net>
Date: Mon Mar 5 14:48:54 2012 +0100
Prefix binaries with racoon2- (797810)
racoon2.spec | 41 +++++++++++++++++++++++++----------------
1 files changed, 25 insertions(+), 16 deletions(-)
---
diff --git a/racoon2.spec b/racoon2.spec
index 5140717..7343c99 100644
--- a/racoon2.spec
+++ b/racoon2.spec
@@ -1,6 +1,6 @@
Name: racoon2
Version: 20100526a
-Release: 16%{?dist}
+Release: 17%{?dist}
Summary: An implementation of key management system for IPsec
Group: System Environment/Daemons
License: BSD
@@ -38,26 +38,32 @@ and KINK protocols. It works on FreeBSD, NetBSD, Linux, and Mac OS X.
%patch3 -p1
%build
-%configure --disable-kinkd --disable-pedant --prefix=%{prefix} --sysconfdir=%{_sysconfdir}
+%configure --disable-kinkd --disable-pedant
# --disable-kinkd: KINK must be disabled unless krb5 is compiled --with-crypto-impl=builtin
# because kinkd uses krb5's internal crypto functions that are not compiled otherwise.
-# --disable-pedant: Racoon2 doesn't compile with pedantic compiler that is enabled
-# in the source tarball.
+# --disable-pedant: Racoon2 doesn't compile with pedantic compiler.
make %{?_smp_mflags}
sed -i 's/\t/ /' samples/*.conf
+# Disable spmd.pwd generation
+echo "#!/bin/sh" > pskgen/autogen.spmd.pwd
%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
+# Rename binaries and manpages
+for name in spmd spmdctl iked pskgen; do
+ mv %{buildroot}%{_sbindir}/{,%{name}-}$name
+ mv %{buildroot}%{_mandir}/man8/{,%{name}-}$name.8
+done
# Delete initscripts first
rm %{buildroot}%{_initddir}/*
# Install systemd units or initscripts
%if 0%{?fedora} >= 15 || 0%{?rhel} >= 7
-install -m 755 -t %{buildroot}/%{_sbindir} %{name}
-install -d %{buildroot}/%{_unitdir}
-install -m 644 -t %{buildroot}/%{_unitdir} %{name}.service
+install -m 755 -t %{buildroot}%{_sbindir} %{name}
+install -d %{buildroot}%{_unitdir}
+install -m 644 -t %{buildroot}%{_unitdir} %{name}.service
%else
-install -m 755 %{name}.sysvinit %{buildroot}/%{_initddir}/%{name}
+install -m 755 %{name}.sysvinit %{buildroot}%{_initddir}/%{name}
%endif
%files
@@ -85,15 +91,15 @@ install -m 755 %{name}.sysvinit %{buildroot}/%{_initddir}/%{name}
%{_sysconfdir}/%{name}/hook/migration
%{_sysconfdir}/%{name}/hook/ph1-down
%{_sysconfdir}/%{name}/hook/ph1-up
-%{_sbindir}/iked
-%{_sbindir}/pskgen
-%{_sbindir}/spmd
-%{_sbindir}/spmdctl
+%{_sbindir}/%{name}-iked
+%{_sbindir}/%{name}-pskgen
+%{_sbindir}/%{name}-spmd
+%{_sbindir}/%{name}-spmdctl
%dir %{_var}/run/%{name}
-%{_mandir}/man8/iked.8.gz
-%{_mandir}/man8/pskgen.8.gz
-%{_mandir}/man8/spmd.8.gz
-%{_mandir}/man8/spmdctl.8.gz
+%{_mandir}/man8/%{name}-iked.8.gz
+%{_mandir}/man8/%{name}-pskgen.8.gz
+%{_mandir}/man8/%{name}-spmd.8.gz
+%{_mandir}/man8/%{name}-spmdctl.8.gz
%if 0%{?fedora} >= 15 || 0%{?rhel} >= 7
%{_sbindir}/%{name}
%{_unitdir}/%{name}.service
@@ -140,6 +146,9 @@ fi
%endif
%changelog
+* Mon Mar 05 2012 Pavel Šimerda <pavlix at pavlix.net> - 20100526a-17
+- Prefix binaries with racoon2-
+
* Tue Feb 14 2012 Pavel Šimerda <pavlix at pavlix.net> - 20100526a-16
- Fixed systemd dependencies
- Switched to a single systemd unit or single initscript
More information about the scm-commits
mailing list