Accepting request 386337 from network:NIS

OBS-URL: https://build.opensuse.org/request/show/386337
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libnsl?expand=0&rev=1

libnsl-1.0.4.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cfeed2dffa165dee7b1a566d99fb407a10eebc0d1dc6980f13efe1ee59814868
+size 375410

libnsl-1.1.0.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9bf9b683f11b264ec271c07285c02ad8d39801bc640560760b4d2977434ff86d
-size 354120

libnsl.changes

@@ -1,36 +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
-
-- Update to version 1.1.0
-  - Fix compilation with new glibc (obsoletes decls.patch)
-  - Add rpcsvc/yp.h
-
--------------------------------------------------------------------
-Wed Jul  5 13:53:16 UTC 2017 - schwab@suse.de
-
-- decls.patch: fix missing declarations
-
--------------------------------------------------------------------
-Thu Feb 23 11:38:55 CET 2017 - kukuk@suse.de
-
-- Update to version 1.0.5
-  - Fix compiler warnings
-
 -------------------------------------------------------------------
 Thu Apr  7 08:42:20 UTC 2016 - dimstar@opensuse.org
 

libnsl.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package libnsl
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,28 +17,27 @@
 
 
 Name:           libnsl
-Version:        1.1.0
+Version:        1.0.4
 Release:        0
 Summary:        Network Support Library (NIS/NIS+)
 License:        LGPL-2.1
 Group:          System/Libraries
-Url:            http://github.com/thkukuk/libnsl
-Source:         %{name}-%{version}.tar.bz2
-Source1:        baselibs.conf
 BuildRequires:  autoconf
 BuildRequires:  libtool
 BuildRequires:  pkg-config
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if 0%{?suse_version} >= 1310
-BuildRequires:  libtirpc-devel >= 1.0
+BuildRequires:	libtirpc-devel >= 1.0
 %endif
-%define debug_package_requires libnsl2 = %{version}-%{release}
+Url:            http://github.com/thkukuk/libnsl
+Source:         %{name}-%{version}.tar.bz2
+Source1:        baselibs.conf
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+%define debug_package_requires libnsl1 = %{version}-%{release}
 
 %description
 The Network Support Library for NIS/NIS+ was formerly part of glibc and
 is now a standalone library. The big difference is, that this library
 has support for IPv6.
-The NIS+ code is deprecated and only there "as is".
 
 %package -n libnsl2
 Summary:        Network Support Library (NIS/NIS+)
@@ -48,7 +47,6 @@ Group:          System/Libraries
 The Network Support Library for NIS/NIS+ was formerly part of glibc and
 is now a standalone library. The big difference is, that this library
 has support for IPv6.
-The NIS+ code is deprecated and only there "as is".
 
 %package devel
 Summary:        Development package for Network Support Library (NIS/NIS+)
@@ -60,37 +58,46 @@ The Network Support Library for NIS/NIS+ was formerly part of glibc and
 is now a standalone library. The big difference is, that this library
 has support for IPv6.
 This package contains all files to develop and link against libnsl.
-The NIS+ API is deprecated and only there "as is".
 
 %prep
 %setup -q
 
 %build
-%configure --disable-static
+%configure --libdir=/%{_libdir}/nsl --includedir=%{_includedir}/nsl
-make %{?_smp_mflags}
+%{__make} %{?_smp_mflags}
 
 %install
 # Don't strip .symtab to allow debugging
 export STRIP_KEEP_SYMTAB=libnsl*.so*
-make %{?_smp_mflags} DESTDIR=%{buildroot} install
+# NO_BRP_CHECK_ROOTFS is for SLES11 only, but does not harm for Factory
-# Remove .la file
+export NO_BRP_CHECK_ROOTFS=true
-rm %{buildroot}%{_libdir}/%{name}.la
+make install DESTDIR=$RPM_BUILD_ROOT
+# move library to /lib
+%{__mkdir} -p $RPM_BUILD_ROOT/%{_lib}
+ %{__mv} -v $RPM_BUILD_ROOT/%{_libdir}/nsl/%{name}.so.2*  $RPM_BUILD_ROOT/%{_lib}/
+# Adjust devel so link
+%{__rm} -v %{buildroot}/%{_libdir}/nsl/%{name}.{a,la,so}
+%{__ln_s} -v /%{_lib}/%{name}.so.2 %{buildroot}%{_libdir}/nsl/%{name}.so
+%{__mv} -v $RPM_BUILD_ROOT/%{_libdir}/nsl/pkgconfig $RPM_BUILD_ROOT/%{_libdir}
 
 %check
-make %{?_smp_mflags} check
+make check
 
 %post -n libnsl2 -p /sbin/ldconfig
+
 %postun -n libnsl2 -p /sbin/ldconfig
 
 %files -n libnsl2
 %defattr(-,root,root)
 %doc COPYING
-%{_libdir}/libnsl.so.2*
+/%{_lib}/libnsl.so.2*
 
 %files devel
 %defattr(-,root,root)
-%{_libdir}/libnsl.so
+%dir %{_libdir}/nsl/
-%{_includedir}/*
+%{_libdir}/nsl/libnsl.so
+%dir %{_includedir}/nsl/
+%{_includedir}/nsl/*
 %{_libdir}/pkgconfig/*
 
 %changelog