[ypserv] Minor spec file fixes Helper scripts moved to /usr/libexec
Honza Horak
hhorak at fedoraproject.org
Wed Jul 11 14:32:34 UTC 2012
commit 4ee950d337588b563b3c56ad868881b1a5a3d686
Author: Honza HorĂ¡k <hhorak at redhat.com>
Date: Wed Jul 11 16:32:16 2012 +0200
Minor spec file fixes
Helper scripts moved to /usr/libexec
yppasswdd.service | 2 +-
ypserv.spec | 21 ++++++++++++---------
2 files changed, 13 insertions(+), 10 deletions(-)
---
diff --git a/yppasswdd.service b/yppasswdd.service
index 284e59d..583afbc 100644
--- a/yppasswdd.service
+++ b/yppasswdd.service
@@ -6,7 +6,7 @@ After=syslog.target network.target rpcbind.service
[Service]
EnvironmentFile=-/etc/sysconfig/network
EnvironmentFile=-/etc/sysconfig/yppasswdd
-ExecStartPre=/usr/lib/ypserv/yppasswdd-pre-setdomain
+ExecStartPre=/usr/libexec/yppasswdd-pre-setdomain
ExecStart=/usr/sbin/rpc.yppasswdd.env
[Install]
diff --git a/ypserv.spec b/ypserv.spec
index 52eac90..615020e 100644
--- a/ypserv.spec
+++ b/ypserv.spec
@@ -4,10 +4,10 @@ Summary: The NIS (Network Information Service) server
Url: http://www.linux-nis.org/nis/ypserv/index.html
Name: ypserv
Version: 2.28
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2
Group: System Environment/Daemons
-Source0: ftp://ftp.kernel.org/pub/linux/utils/net/NIS/ypserv-%{version}.tar.bz2
+Source0: http://www.linux-nis.org/download/ypserv/ypserv-%{version}.tar.bz2
Source1: ypserv.service
Source2: yppasswdd.service
Source3: ypxfrd.service
@@ -37,9 +37,6 @@ BuildRequires: tokyocabinet-devel
BuildRequires: systemd-units
BuildRequires: autoconf, automake
-# Location where helper scripts are located
-%define scripts_path /usr/lib/%{name}
-
%description
The Network Information Service (NIS) is a system that provides
network information (login names, passwords, home directories, group
@@ -91,12 +88,14 @@ rm -rf $RPM_BUILD_ROOT
#make install ROOT=$RPM_BUILD_ROOT
%makeinstall libexecdir=$RPM_BUILD_ROOT%{_libdir}/yp INSTALL_PROGRAM=install
-mkdir -p $RPM_BUILD_ROOT%{_unitdir} $RPM_BUILD_ROOT%{_sysconfdir} $RPM_BUILD_ROOT%{scripts_path}
+mkdir -p $RPM_BUILD_ROOT%{_unitdir}
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
+mkdir -p $RPM_BUILD_ROOT%{_libexecdir}
install -m 644 etc/ypserv.conf $RPM_BUILD_ROOT%{_sysconfdir}
install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_unitdir}/ypserv.service
install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_unitdir}/yppasswdd.service
install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_unitdir}/ypxfrd.service
-install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{scripts_path}/yppasswdd-pre-setdomain
+install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/yppasswdd-pre-setdomain
mkdir -p $RPM_BUILD_ROOT/etc/sysconfig
cat >$RPM_BUILD_ROOT/etc/sysconfig/yppasswdd <<EOF
@@ -170,7 +169,7 @@ fi
olddomain=`/bin/domainname`
. /etc/sysconfig/network
export NISDOMAIN
-%{scripts_path}/yppasswdd-pre-setdomain || :
+%{_libexecdir}/yppasswdd-pre-setdomain || :
touch /var/yp/Makefile
NOPUSH=true make -eC /var/yp >&2 || :
/bin/domainname "$olddomain"
@@ -184,13 +183,17 @@ NOPUSH=true make -eC /var/yp >&2 || :
%config(noreplace) %{_sysconfdir}/sysconfig/yppasswdd
%config(noreplace) /var/yp/*
%{_unitdir}/*
-%{scripts_path}/*
+%{_libexecdir}/*
%{_libdir}/yp
%{_sbindir}/*
%{_mandir}/*/*
%{_includedir}/*/*
%changelog
+* Wed Jul 11 2012 Honza Horak <hhorak at redhat.com> - 2.28-2
+- Minor spec file fixes
+- Helper scripts moved to /usr/libexec
+
* Mon Jun 04 2012 Honza Horak <hhorak at redhat.com> - 2.28-1
- Update to new upstream version, which fixes several bugs
- Use Tokyo Cabinet as DBM and rebuild maps after updating
More information about the scm-commits
mailing list