From c87625a1cbef6c355d88bb71fe982c86efa754d8 Mon Sep 17 00:00:00 2001 From: Matej Muzila Date: Mon, 11 Jun 2018 17:48:38 +0200 Subject: [PATCH] Clean spec --- ypserv.spec | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/ypserv.spec b/ypserv.spec index 356bfea..e33fc78 100644 --- a/ypserv.spec +++ b/ypserv.spec @@ -7,11 +7,9 @@ Summary: The NIS (Network Information Service) server Url: http://www.linux-nis.org/nis/ypserv/index.html Name: ypserv Version: 4.0 -Release: 7.20170331git%{shortcommit0}%{?dist} +Release: 8.20170331git%{shortcommit0}%{?dist} License: GPLv2 Group: System Environment/Daemons -#Source0: http://www.linux-nis.org/download/ypserv/ypserv-%{version}.tar.bz2 -#Source0: https://github.com/thkukuk/ypserv/archive/ypserv-%{version}.tar.gz#/ypserv-ypserv-%{version}.tar.gz Source0: https://github.com/thkukuk/%{name}/archive/%{commit0}.tar.gz#/%{name}-%{shortcommit0}.tar.gz Source1: ypserv.service Source2: yppasswdd.service @@ -36,7 +34,6 @@ Patch6: ypserv-4.0-manfix.patch Patch7: ypserv-2.24-aliases.patch Patch8: ypserv-2.27-confpost.patch Patch10: ypserv-2.31-netgrprecur.patch -Patch11: ypserv-2.32-systemdso.patch Patch12: ypserv-4.0-headers.patch Patch13: ypserv-4.0-oldaddr.patch @@ -67,7 +64,7 @@ machines. %prep -%setup -n %{name}-%{commit0} +%setup -q -n %{name}-%{commit0} %patch0 -p1 -b .redhat %patch2 -p1 -b .nfsnobody @@ -78,7 +75,6 @@ machines. %patch7 -p1 -b .aliases %patch8 -p1 -b .confpost %patch10 -p1 -b .netgrprecur -#%patch11 -p1 -b .systemdso %patch12 -b .headers %patch13 -p1 -b .oldaddr @@ -100,17 +96,15 @@ export CFLAGS="$RPM_OPT_FLAGS -fpic" %configure \ - --enable-checkroot \ - --enable-fqdn \ - --libexecdir=%{_libdir}/yp \ - --with-dbmliborder=tokyocabinet \ + --enable-checkroot \ + --enable-fqdn \ + --libexecdir=%{_libdir}/yp \ + --with-dbmliborder=tokyocabinet \ -localstatedir=%{_localstatedir} make %install -#make install ROOT=$RPM_BUILD_ROOT -#%make_install libexecdir=$RPM_BUILD_ROOT%{_libdir}/yp INSTALL_PROGRAM=install %make_install mkdir -p $RPM_BUILD_ROOT%{_unitdir} mkdir -p $RPM_BUILD_ROOT%{_sysconfdir} @@ -213,7 +207,7 @@ if [ $1 == 2 ] ; then master=`%{_libdir}/yp/makedbm -u $map 2>/dev/null | grep YP_MASTER_NAME | sed -e 's/YP_MASTER_NAME//'` if [ "x$master" != "x" ] ; then echo "%{_libdir}/yp/ypxfr -f -h $master -c -d $newdomain $map" >> %rebuild_maps_script - fi + fi fi done echo "make NOPUSH=true -C /var/yp" >> %rebuild_maps_script @@ -248,6 +242,9 @@ fi %{_includedir}/rpcsvc %changelog +* Mon Jun 11 2018 Matej Mužila - 4.0-8.20170331git5bfba76 +- Clean spec + * Mon Jun 11 2018 Matej Mužila - 4.0-7.20170331git5bfba76 - Remove no longer needed relro patch - Fix man pages