rpm/ceph
SHA256
1
0
Fork 0
forked from pool/ceph
Code Pull Requests Activity

Update link from rev 16 to rev 20

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/ceph?expand=0&rev=33
This commit is contained in:
Nathan Cutler
2016-06-12 20:57:57 +00:00
committed by Git OBS Bridge
parent 574909f7fc
commit 64ab6adb90
5 changed files with 67 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ceph.spec
View File

@@ -49,8 +49,8 @@
# common
#################################################################################
Name: ceph
Version: 10.2.1+git.1464774627.abc3d6b
Release: 0
Version: 10.2.1+git.1465763247.b9decd3
Release: 0%{?dist}
Summary: User space components of the Ceph file system
License: LGPL-2.1 and CC-BY-SA-1.0 and GPL-2.0 and BSL-1.0 and GPL-2.0-with-autoconf-exception and BSD-3-Clause and MIT
%if 0%{?suse_version}
@@ -59,7 +59,7 @@ Group: System/Filesystems
URL: http://ceph.com/
Source0: %{name}-%{version}.tar.bz2
Source99: ceph-rpmlintrc
ExclusiveArch: x86_64 aarch64
ExcludeArch: i586
#################################################################################
# dependencies that apply across all distro families
#################################################################################
@@ -671,7 +671,6 @@ export RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed -e 's/i386/i486/'`
# Parallel build settings ...
PARALLEL_BUILD=%{?_smp_mflags}
%if %{with lowmem_builder}
lo_jobs="%{?jobs:%{jobs}}"
%ifarch %arm
%if ! 0%{?qemu_user_space_build:1}
@@ -696,7 +695,6 @@ fi
if test -n "$lo_jobs" ; then
PARALLEL_BUILD="-j$lo_jobs"
fi
%endif
make "$PARALLEL_BUILD"
@@ -1481,6 +1479,8 @@ fi
# Now, relabel the files
/usr/sbin/fixfiles -C ${FILE_CONTEXT}.pre restore 2> /dev/null
rm -f ${FILE_CONTEXT}.pre
# The fixfiles command won't fix label for /var/run/ceph
/usr/sbin/restorecon -R /var/run/ceph > /dev/null 2>&1
# Start the daemons iff they were running before
if test $STATUS -eq 0; then
@@ -1496,7 +1496,7 @@ if [ $1 -eq 0 ]; then
cp ${FILE_CONTEXT} ${FILE_CONTEXT}.pre
# Remove the module
/usr/sbin/semodule -n -r ceph
/usr/sbin/semodule -n -r ceph > /dev/null 2>&1
# Reload the policy if SELinux is enabled
if ! /usr/sbin/selinuxenabled ; then
@@ -1515,6 +1515,8 @@ if [ $1 -eq 0 ]; then
/usr/sbin/fixfiles -C ${FILE_CONTEXT}.pre restore 2> /dev/null
rm -f ${FILE_CONTEXT}.pre
# The fixfiles command won't fix label for /var/run/ceph
/usr/sbin/restorecon -R /var/run/ceph > /dev/null 2>&1
# Start the daemons if they were running before
if test $STATUS -eq 0; then