From 577bbc8a6ec29dfc3e8e97d6ad1eabedae14c37d2cdae356371fcb830fba4fe6 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 23 Jan 2018 11:08:20 +0000 Subject: [PATCH 1/2] Accepting request 565923 from home:kukuk:branches:Base:System - Move /usr/include/tirpc to /usr/include OBS-URL: https://build.opensuse.org/request/show/565923 OBS-URL: https://build.opensuse.org/package/show/Base:System/libtirpc?expand=0&rev=66 --- libtirpc.changes | 5 +++++ libtirpc.spec | 9 ++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/libtirpc.changes b/libtirpc.changes index 0e0bc8b..03229a2 100644 --- a/libtirpc.changes +++ b/libtirpc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jan 15 16:59:02 CET 2018 - kukuk@suse.de + +- Move /usr/include/tirpc to /usr/include + ------------------------------------------------------------------- Mon Nov 27 14:30:05 CET 2017 - kukuk@suse.de diff --git a/libtirpc.spec b/libtirpc.spec index ac97d85..d33cd1d 100644 --- a/libtirpc.spec +++ b/libtirpc.spec @@ -1,7 +1,7 @@ # # spec file for package libtirpc # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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 @@ -119,6 +119,10 @@ mkdir -p %{buildroot}/%{_libdir} ln -sv /%{_lib}/$(readlink %{buildroot}/%{_lib}/%{name}.so) %{buildroot}%{_libdir}/%{name}.so rm -v %{buildroot}/%{_lib}/%{name}.{la,so} mv -v %{buildroot}/%{_lib}/pkgconfig %{buildroot}/%{_libdir} +# Move RPC headers from tirpc subdirectory into main directory, +# they are now default +mv -v %{buildroot}%{_includedir}/tirpc/* %{buildroot}%{_includedir} +rmdir %{buildroot}%{_includedir}/tirpc %post -n libtirpc3 -p /sbin/ldconfig @@ -137,8 +141,7 @@ mv -v %{buildroot}/%{_lib}/pkgconfig %{buildroot}/%{_libdir} %files devel %defattr(-,root,root) %{_libdir}/libtirpc.so -%dir /usr/include/tirpc/ -/usr/include/tirpc/* +/usr/include/* /usr/%{_lib}/pkgconfig/* %{_mandir}/man3/* From 980f76f9cf2aa600d5de65d9fd668ee11e7c77f6c2a74d52885855bef5b72b26 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 27 Feb 2018 09:47:28 +0000 Subject: [PATCH 2/2] Accepting request 580104 from home:favogt:licensetag Use %license (boo#1082318). Please forward to SLE, if possible OBS-URL: https://build.opensuse.org/request/show/580104 OBS-URL: https://build.opensuse.org/package/show/Base:System/libtirpc?expand=0&rev=67 --- libtirpc.changes | 5 +++++ libtirpc.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/libtirpc.changes b/libtirpc.changes index 03229a2..3751a8d 100644 --- a/libtirpc.changes +++ b/libtirpc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Feb 22 15:10:39 UTC 2018 - fvogt@suse.com + +- Use %license (boo#1082318) + ------------------------------------------------------------------- Mon Jan 15 16:59:02 CET 2018 - kukuk@suse.de diff --git a/libtirpc.spec b/libtirpc.spec index d33cd1d..702e004 100644 --- a/libtirpc.spec +++ b/libtirpc.spec @@ -130,7 +130,7 @@ rmdir %{buildroot}%{_includedir}/tirpc %files -n libtirpc3 %defattr(-,root,root) -%doc COPYING COPYING.GPLv2 +%license COPYING COPYING.GPLv2 /%{_lib}/libtirpc.so.3* %files netconfig