From bfbd96ebec608ad20ecbc99f06a1d00d57f0bfb1d884c9e21bd92a096d4c8d6c Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 11 Apr 2016 08:28:01 +0000 Subject: [PATCH 1/4] 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 | 3 +++ libnsl-1.1.0.tar.bz2 | 3 --- libnsl.changes | 33 ------------------------------- libnsl.spec | 47 +++++++++++++++++++++++++------------------- 4 files changed, 30 insertions(+), 56 deletions(-) create mode 100644 libnsl-1.0.4.tar.bz2 delete mode 100644 libnsl-1.1.0.tar.bz2 diff --git a/libnsl-1.0.4.tar.bz2 b/libnsl-1.0.4.tar.bz2 new file mode 100644 index 0000000..4ced3f5 --- /dev/null +++ b/libnsl-1.0.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cfeed2dffa165dee7b1a566d99fb407a10eebc0d1dc6980f13efe1ee59814868 +size 375410 diff --git a/libnsl-1.1.0.tar.bz2 b/libnsl-1.1.0.tar.bz2 deleted file mode 100644 index f57496d..0000000 --- a/libnsl-1.1.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9bf9b683f11b264ec271c07285c02ad8d39801bc640560760b4d2977434ff86d -size 354120 diff --git a/libnsl.changes b/libnsl.changes index 2fd1abb..f652b73 100644 --- a/libnsl.changes +++ b/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 diff --git a/libnsl.spec b/libnsl.spec index 4cdb9bc..a760e08 100644 --- a/libnsl.spec +++ b/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 -make %{?_smp_mflags} +%configure --libdir=/%{_libdir}/nsl --includedir=%{_includedir}/nsl +%{__make} %{?_smp_mflags} %install # Don't strip .symtab to allow debugging export STRIP_KEEP_SYMTAB=libnsl*.so* -make %{?_smp_mflags} DESTDIR=%{buildroot} install -# Remove .la file -rm %{buildroot}%{_libdir}/%{name}.la +# NO_BRP_CHECK_ROOTFS is for SLES11 only, but does not harm for Factory +export NO_BRP_CHECK_ROOTFS=true +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 -%{_includedir}/* +%dir %{_libdir}/nsl/ +%{_libdir}/nsl/libnsl.so +%dir %{_includedir}/nsl/ +%{_includedir}/nsl/* %{_libdir}/pkgconfig/* %changelog From 780e25e55a3505ab619602b03e0d0e079f8fcb1315012b4aa89211a79388e4d2 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 24 Aug 2017 15:40:29 +0000 Subject: [PATCH 2/4] Accepting request 517650 from network:NIS - Update to version 1.1.0 - Fix compilation with new glibc (obsoletes decls.patch) - Add rpcsvc/yp.h - decls.patch: fix missing declarations - Update to version 1.0.5 - Fix compiler warnings OBS-URL: https://build.opensuse.org/request/show/517650 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libnsl?expand=0&rev=2 --- libnsl-1.0.4.tar.bz2 | 3 --- libnsl-1.1.0.tar.bz2 | 3 +++ libnsl.changes | 18 ++++++++++++++++++ libnsl.spec | 40 ++++++++++++++++++++-------------------- 4 files changed, 41 insertions(+), 23 deletions(-) delete mode 100644 libnsl-1.0.4.tar.bz2 create mode 100644 libnsl-1.1.0.tar.bz2 diff --git a/libnsl-1.0.4.tar.bz2 b/libnsl-1.0.4.tar.bz2 deleted file mode 100644 index 4ced3f5..0000000 --- a/libnsl-1.0.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cfeed2dffa165dee7b1a566d99fb407a10eebc0d1dc6980f13efe1ee59814868 -size 375410 diff --git a/libnsl-1.1.0.tar.bz2 b/libnsl-1.1.0.tar.bz2 new file mode 100644 index 0000000..f57496d --- /dev/null +++ b/libnsl-1.1.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9bf9b683f11b264ec271c07285c02ad8d39801bc640560760b4d2977434ff86d +size 354120 diff --git a/libnsl.changes b/libnsl.changes index f652b73..58dd276 100644 --- a/libnsl.changes +++ b/libnsl.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +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 diff --git a/libnsl.spec b/libnsl.spec index a760e08..5794f09 100644 --- a/libnsl.spec +++ b/libnsl.spec @@ -1,7 +1,7 @@ # # spec file for package libnsl # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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,27 +17,28 @@ Name: libnsl -Version: 1.0.4 +Version: 1.1.0 Release: 0 Summary: Network Support Library (NIS/NIS+) License: LGPL-2.1 Group: System/Libraries -BuildRequires: autoconf -BuildRequires: libtool -BuildRequires: pkg-config -%if 0%{?suse_version} >= 1310 -BuildRequires: libtirpc-devel >= 1.0 -%endif 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 -%define debug_package_requires libnsl1 = %{version}-%{release} +%if 0%{?suse_version} >= 1310 +BuildRequires: libtirpc-devel >= 1.0 +%endif +%define debug_package_requires libnsl2 = %{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+) @@ -47,6 +48,7 @@ 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+) @@ -58,39 +60,37 @@ 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 --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* # NO_BRP_CHECK_ROOTFS is for SLES11 only, but does not harm for Factory export NO_BRP_CHECK_ROOTFS=true -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}/ +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 /%{_lib}/%{name}.so.2 %{buildroot}%{_libdir}/nsl/%{name}.so -%{__mv} -v $RPM_BUILD_ROOT/%{_libdir}/nsl/pkgconfig $RPM_BUILD_ROOT/%{_libdir} +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 check +make %{?_smp_mflags} check %post -n libnsl2 -p /sbin/ldconfig - %postun -n libnsl2 -p /sbin/ldconfig %files -n libnsl2 %defattr(-,root,root) %doc COPYING -/%{_lib}/libnsl.so.2* +%{_libdir}/libnsl.so.2* %files devel %defattr(-,root,root) From 32d25767dd49466e09ac5ecd69f0b572bffe412cf4138e9267b2ef7e0f421180 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 14 Sep 2017 19:10:30 +0000 Subject: [PATCH 3/4] Accepting request 523644 from network:NIS - Install yppasswd.h again - Disable static library - Don't install into nsl subdirectories OBS-URL: https://build.opensuse.org/request/show/523644 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libnsl?expand=0&rev=3 --- 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 From ef34414928fa0db14f82e2d7511dd505102351afcd7a3f4a7f0d53c6cd076799 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sun, 24 Sep 2017 09:32:24 +0000 Subject: [PATCH 4/4] Accepting request 528499 from openSUSE:Factory Revert to pre-NIS deprecation - 10 days is really enough OBS-URL: https://build.opensuse.org/request/show/528499 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libnsl?expand=0&rev=4 --- 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