From 6dc5b4c21cb26fcf4185933eaf1f6881f42c762bd2904d8aa7d4a5c1473d337e Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Sun, 24 Sep 2017 09:32:24 +0000 Subject: [PATCH 1/2] Updating link to change in openSUSE:Factory/libnsl revision 4.0 OBS-URL: https://build.opensuse.org/package/show/network:NIS/libnsl?expand=0&rev=1f43625b1eba6b6e132608d67876a4a8 --- libnsl.changes | 15 --------------- libnsl.spec | 17 ++++++++++++----- 2 files changed, 12 insertions(+), 20 deletions(-) diff --git a/libnsl.changes b/libnsl.changes index 2fd1abb..58dd276 100644 --- a/libnsl.changes +++ b/libnsl.changes @@ -1,18 +1,3 @@ -------------------------------------------------------------------- -Tue Sep 12 12:43:01 CEST 2017 - kukuk@suse.de - -- Install yppasswd.h again - -------------------------------------------------------------------- -Tue Sep 5 12:54:29 CEST 2017 - kukuk@suse.de - -- Disable static library - -------------------------------------------------------------------- -Wed Aug 30 13:35:01 CEST 2017 - kukuk@suse.de - -- Don't install into nsl subdirectories - ------------------------------------------------------------------- Fri Aug 18 19:53:51 UTC 2017 - kukuk@suse.com diff --git a/libnsl.spec b/libnsl.spec index 4cdb9bc..5794f09 100644 --- a/libnsl.spec +++ b/libnsl.spec @@ -66,15 +66,20 @@ The NIS+ API is deprecated and only there "as is". %setup -q %build -%configure --disable-static +%configure --libdir=/%{_libdir}/nsl --includedir=%{_includedir}/nsl make %{?_smp_mflags} %install # Don't strip .symtab to allow debugging export STRIP_KEEP_SYMTAB=libnsl*.so* +# NO_BRP_CHECK_ROOTFS is for SLES11 only, but does not harm for Factory +export NO_BRP_CHECK_ROOTFS=true make %{?_smp_mflags} DESTDIR=%{buildroot} install -# Remove .la file -rm %{buildroot}%{_libdir}/%{name}.la +mv -v %{buildroot}/%{_libdir}/nsl/%{name}.so.2* %{buildroot}%{_libdir}/ +# Adjust devel so link +rm -v %{buildroot}/%{_libdir}/nsl/%{name}.{a,la,so} +ln -s -v %{_libdir}/%{name}.so.2 %{buildroot}%{_libdir}/nsl/%{name}.so +mv -v %{buildroot}/%{_libdir}/nsl/pkgconfig %{buildroot}/%{_libdir} %check make %{?_smp_mflags} check @@ -89,8 +94,10 @@ make %{?_smp_mflags} check %files devel %defattr(-,root,root) -%{_libdir}/libnsl.so -%{_includedir}/* +%dir %{_libdir}/nsl/ +%{_libdir}/nsl/libnsl.so +%dir %{_includedir}/nsl/ +%{_includedir}/nsl/* %{_libdir}/pkgconfig/* %changelog From cc2ae5823aac9e692aa3298ca21b13b6f0f7660d31beff6467804065ed20dd2f Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sun, 24 Sep 2017 09:35:38 +0000 Subject: [PATCH 2/2] Accepting request 528501 from openSUSE:Factory Re-add the last changes OBS-URL: https://build.opensuse.org/request/show/528501 OBS-URL: https://build.opensuse.org/package/show/network:NIS/libnsl?expand=0&rev=21 --- libnsl.changes | 15 +++++++++++++++ libnsl.spec | 17 +++++------------ 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/libnsl.changes b/libnsl.changes index 58dd276..2fd1abb 100644 --- a/libnsl.changes +++ b/libnsl.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Tue Sep 12 12:43:01 CEST 2017 - kukuk@suse.de + +- Install yppasswd.h again + +------------------------------------------------------------------- +Tue Sep 5 12:54:29 CEST 2017 - kukuk@suse.de + +- Disable static library + +------------------------------------------------------------------- +Wed Aug 30 13:35:01 CEST 2017 - kukuk@suse.de + +- Don't install into nsl subdirectories + ------------------------------------------------------------------- Fri Aug 18 19:53:51 UTC 2017 - kukuk@suse.com diff --git a/libnsl.spec b/libnsl.spec index 5794f09..4cdb9bc 100644 --- a/libnsl.spec +++ b/libnsl.spec @@ -66,20 +66,15 @@ The NIS+ API is deprecated and only there "as is". %setup -q %build -%configure --libdir=/%{_libdir}/nsl --includedir=%{_includedir}/nsl +%configure --disable-static make %{?_smp_mflags} %install # Don't strip .symtab to allow debugging export STRIP_KEEP_SYMTAB=libnsl*.so* -# NO_BRP_CHECK_ROOTFS is for SLES11 only, but does not harm for Factory -export NO_BRP_CHECK_ROOTFS=true make %{?_smp_mflags} DESTDIR=%{buildroot} install -mv -v %{buildroot}/%{_libdir}/nsl/%{name}.so.2* %{buildroot}%{_libdir}/ -# Adjust devel so link -rm -v %{buildroot}/%{_libdir}/nsl/%{name}.{a,la,so} -ln -s -v %{_libdir}/%{name}.so.2 %{buildroot}%{_libdir}/nsl/%{name}.so -mv -v %{buildroot}/%{_libdir}/nsl/pkgconfig %{buildroot}/%{_libdir} +# Remove .la file +rm %{buildroot}%{_libdir}/%{name}.la %check make %{?_smp_mflags} check @@ -94,10 +89,8 @@ make %{?_smp_mflags} check %files devel %defattr(-,root,root) -%dir %{_libdir}/nsl/ -%{_libdir}/nsl/libnsl.so -%dir %{_includedir}/nsl/ -%{_includedir}/nsl/* +%{_libdir}/libnsl.so +%{_includedir}/* %{_libdir}/pkgconfig/* %changelog