From 795e4e79c0d0b661057c7e40cf52b0fc7b049c54456124591f78a7f2d9b306ab Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Mon, 28 Jun 2010 14:23:29 +0000 Subject: [PATCH 1/3] Accepting request 42138 from home:jengelh:smp Copy from home:jengelh:smp/libselinux via accept of submit request 42138 revision 2. Request was accepted with message: Reviewed ok OBS-URL: https://build.opensuse.org/request/show/42138 OBS-URL: https://build.opensuse.org/package/show/security:SELinux/libselinux?expand=0&rev=37 --- libselinux-bindings.changes | 5 +++++ libselinux-bindings.spec | 8 ++++---- libselinux.changes | 5 +++++ libselinux.spec | 2 +- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/libselinux-bindings.changes b/libselinux-bindings.changes index 5abd001..97b364a 100644 --- a/libselinux-bindings.changes +++ b/libselinux-bindings.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jun 28 06:38:35 UTC 2010 - jengelh@medozas.de + +- use %_smp_mflags + ------------------------------------------------------------------- Thu Feb 25 14:57:16 UTC 2010 - prusnak@suse.cz diff --git a/libselinux-bindings.spec b/libselinux-bindings.spec index 7e6cb99..367d91b 100644 --- a/libselinux-bindings.spec +++ b/libselinux-bindings.spec @@ -105,10 +105,10 @@ decisions. Required for any applications that use the SELinux API. %patch0 -p1 %build -make %{?jobs:-j%jobs} LIBDIR="%{_libdir}" CFLAGS="$RPM_OPT_FLAGS" -C src -make %{?jobs:-j%jobs} LIBDIR="%{_libdir}" CFLAGS="$RPM_OPT_FLAGS" -C src swigify -make %{?jobs:-j%jobs} LIBDIR="%{_libdir}" CFLAGS="$RPM_OPT_FLAGS" -C src pywrap -make %{?jobs:-j%jobs} LIBDIR="%{_libdir}" CFLAGS="$RPM_OPT_FLAGS" -C src rubywrap +make %{?_smp_mflags} LIBDIR="%{_libdir}" CFLAGS="$RPM_OPT_FLAGS" -C src +make %{?_smp_mflags} LIBDIR="%{_libdir}" CFLAGS="$RPM_OPT_FLAGS" -C src swigify +make %{?_smp_mflags} LIBDIR="%{_libdir}" CFLAGS="$RPM_OPT_FLAGS" -C src pywrap +make %{?_smp_mflags} LIBDIR="%{_libdir}" CFLAGS="$RPM_OPT_FLAGS" -C src rubywrap %install make DESTDIR="$RPM_BUILD_ROOT" LIBDIR="$RPM_BUILD_ROOT%{_libdir}" SHLIBDIR="$RPM_BUILD_ROOT/%{_lib}" -C src install diff --git a/libselinux.changes b/libselinux.changes index 1bd0523..b5905d2 100644 --- a/libselinux.changes +++ b/libselinux.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jun 28 06:38:35 UTC 2010 - jengelh@medozas.de + +- use %_smp_mflags + ------------------------------------------------------------------- Mon May 3 10:30:40 UTC 2010 - prusnak@suse.cz diff --git a/libselinux.spec b/libselinux.spec index 1c5b892..12b2a64 100644 --- a/libselinux.spec +++ b/libselinux.spec @@ -124,7 +124,7 @@ necessary to develop your own software using libselinux. %patch0 -p1 %build -make %{?jobs:-j%jobs} LIBDIR="%{_libdir}" CFLAGS="$RPM_OPT_FLAGS" +make %{?_smp_mflags} LIBDIR="%{_libdir}" CFLAGS="$RPM_OPT_FLAGS" %install mkdir -p $RPM_BUILD_ROOT/%{_lib} From 697924a3ac4908126cd1fe3efbcf35efcbad4b113b2119ade703f42e3b935cbb Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Thu, 7 Oct 2010 23:22:32 +0000 Subject: [PATCH 2/3] Accepting request 49868 from security:SELinux checked in (request 49868) OBS-URL: https://build.opensuse.org/request/show/49868 OBS-URL: https://build.opensuse.org/package/show/security:SELinux/libselinux?expand=0&rev=38 --- libselinux-bindings.changes | 5 ----- libselinux-bindings.spec | 8 ++++---- libselinux.changes | 5 ----- libselinux.spec | 2 +- 4 files changed, 5 insertions(+), 15 deletions(-) diff --git a/libselinux-bindings.changes b/libselinux-bindings.changes index 97b364a..5abd001 100644 --- a/libselinux-bindings.changes +++ b/libselinux-bindings.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Mon Jun 28 06:38:35 UTC 2010 - jengelh@medozas.de - -- use %_smp_mflags - ------------------------------------------------------------------- Thu Feb 25 14:57:16 UTC 2010 - prusnak@suse.cz diff --git a/libselinux-bindings.spec b/libselinux-bindings.spec index 367d91b..7e6cb99 100644 --- a/libselinux-bindings.spec +++ b/libselinux-bindings.spec @@ -105,10 +105,10 @@ decisions. Required for any applications that use the SELinux API. %patch0 -p1 %build -make %{?_smp_mflags} LIBDIR="%{_libdir}" CFLAGS="$RPM_OPT_FLAGS" -C src -make %{?_smp_mflags} LIBDIR="%{_libdir}" CFLAGS="$RPM_OPT_FLAGS" -C src swigify -make %{?_smp_mflags} LIBDIR="%{_libdir}" CFLAGS="$RPM_OPT_FLAGS" -C src pywrap -make %{?_smp_mflags} LIBDIR="%{_libdir}" CFLAGS="$RPM_OPT_FLAGS" -C src rubywrap +make %{?jobs:-j%jobs} LIBDIR="%{_libdir}" CFLAGS="$RPM_OPT_FLAGS" -C src +make %{?jobs:-j%jobs} LIBDIR="%{_libdir}" CFLAGS="$RPM_OPT_FLAGS" -C src swigify +make %{?jobs:-j%jobs} LIBDIR="%{_libdir}" CFLAGS="$RPM_OPT_FLAGS" -C src pywrap +make %{?jobs:-j%jobs} LIBDIR="%{_libdir}" CFLAGS="$RPM_OPT_FLAGS" -C src rubywrap %install make DESTDIR="$RPM_BUILD_ROOT" LIBDIR="$RPM_BUILD_ROOT%{_libdir}" SHLIBDIR="$RPM_BUILD_ROOT/%{_lib}" -C src install diff --git a/libselinux.changes b/libselinux.changes index b5905d2..1bd0523 100644 --- a/libselinux.changes +++ b/libselinux.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Mon Jun 28 06:38:35 UTC 2010 - jengelh@medozas.de - -- use %_smp_mflags - ------------------------------------------------------------------- Mon May 3 10:30:40 UTC 2010 - prusnak@suse.cz diff --git a/libselinux.spec b/libselinux.spec index 12b2a64..1c5b892 100644 --- a/libselinux.spec +++ b/libselinux.spec @@ -124,7 +124,7 @@ necessary to develop your own software using libselinux. %patch0 -p1 %build -make %{?_smp_mflags} LIBDIR="%{_libdir}" CFLAGS="$RPM_OPT_FLAGS" +make %{?jobs:-j%jobs} LIBDIR="%{_libdir}" CFLAGS="$RPM_OPT_FLAGS" %install mkdir -p $RPM_BUILD_ROOT/%{_lib} From c282115149feee3fa14cf2ce6cd5beafb4b67f181a1236927b7e304910182e29 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Thu, 6 Oct 2011 15:08:08 +0000 Subject: [PATCH 3/3] Accepting request 86730 from home:uli_suse:branches:security:SELinux - cross-build fix: use %__cc macro OBS-URL: https://build.opensuse.org/request/show/86730 OBS-URL: https://build.opensuse.org/package/show/security:SELinux/libselinux?expand=0&rev=39 --- libselinux-bindings.changes | 5 +++++ libselinux-bindings.spec | 14 +++++++------- libselinux.changes | 10 ++++++++++ libselinux.spec | 8 ++++---- 4 files changed, 26 insertions(+), 11 deletions(-) diff --git a/libselinux-bindings.changes b/libselinux-bindings.changes index 5abd001..97b364a 100644 --- a/libselinux-bindings.changes +++ b/libselinux-bindings.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jun 28 06:38:35 UTC 2010 - jengelh@medozas.de + +- use %_smp_mflags + ------------------------------------------------------------------- Thu Feb 25 14:57:16 UTC 2010 - prusnak@suse.cz diff --git a/libselinux-bindings.spec b/libselinux-bindings.spec index 7e6cb99..756ae60 100644 --- a/libselinux-bindings.spec +++ b/libselinux-bindings.spec @@ -1,7 +1,7 @@ # -# spec file for package libselinux-bindings (Version 2.0.91) +# spec file for package libselinux-bindings # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,7 +23,7 @@ BuildRequires: libsepol-devel-static >= %{libsepol_ver} Name: libselinux-bindings Version: 2.0.91 -Release: 4 +Release: 9 Url: http://www.nsa.gov/selinux/ License: GPLv2 ; Public Domain, Freeware Group: System/Libraries @@ -105,10 +105,10 @@ decisions. Required for any applications that use the SELinux API. %patch0 -p1 %build -make %{?jobs:-j%jobs} LIBDIR="%{_libdir}" CFLAGS="$RPM_OPT_FLAGS" -C src -make %{?jobs:-j%jobs} LIBDIR="%{_libdir}" CFLAGS="$RPM_OPT_FLAGS" -C src swigify -make %{?jobs:-j%jobs} LIBDIR="%{_libdir}" CFLAGS="$RPM_OPT_FLAGS" -C src pywrap -make %{?jobs:-j%jobs} LIBDIR="%{_libdir}" CFLAGS="$RPM_OPT_FLAGS" -C src rubywrap +make %{?_smp_mflags} LIBDIR="%{_libdir}" CFLAGS="$RPM_OPT_FLAGS" -C src +make %{?_smp_mflags} LIBDIR="%{_libdir}" CFLAGS="$RPM_OPT_FLAGS" -C src swigify +make %{?_smp_mflags} LIBDIR="%{_libdir}" CFLAGS="$RPM_OPT_FLAGS" -C src pywrap +make %{?_smp_mflags} LIBDIR="%{_libdir}" CFLAGS="$RPM_OPT_FLAGS" -C src rubywrap %install make DESTDIR="$RPM_BUILD_ROOT" LIBDIR="$RPM_BUILD_ROOT%{_libdir}" SHLIBDIR="$RPM_BUILD_ROOT/%{_lib}" -C src install diff --git a/libselinux.changes b/libselinux.changes index 1bd0523..192bde9 100644 --- a/libselinux.changes +++ b/libselinux.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Wed Oct 5 15:09:25 UTC 2011 - uli@suse.com + +- cross-build fix: use %__cc macro + +------------------------------------------------------------------- +Mon Jun 28 06:38:35 UTC 2010 - jengelh@medozas.de + +- use %_smp_mflags + ------------------------------------------------------------------- Mon May 3 10:30:40 UTC 2010 - prusnak@suse.cz diff --git a/libselinux.spec b/libselinux.spec index 1c5b892..25d4e0d 100644 --- a/libselinux.spec +++ b/libselinux.spec @@ -1,7 +1,7 @@ # -# spec file for package libselinux (Version 2.0.91) +# spec file for package libselinux # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,7 +22,7 @@ BuildRequires: libsepol-devel >= %{libsepol_ver} pkg-config Name: libselinux Version: 2.0.91 -Release: 4 +Release: 9 Url: http://www.nsa.gov/selinux/ License: GPLv2 ; Public Domain, Freeware Group: System/Libraries @@ -124,7 +124,7 @@ necessary to develop your own software using libselinux. %patch0 -p1 %build -make %{?jobs:-j%jobs} LIBDIR="%{_libdir}" CFLAGS="$RPM_OPT_FLAGS" +make %{?_smp_mflags} LIBDIR="%{_libdir}" CC="%{__cc}" CFLAGS="$RPM_OPT_FLAGS" %install mkdir -p $RPM_BUILD_ROOT/%{_lib}