diff --git a/.gitignore b/.gitignore index 479cc14..566c393 100644 --- a/.gitignore +++ b/.gitignore @@ -1,19 +1,2 @@ -ceph-0.20.tar.gz -/ceph-0.21.3.tar.gz -/ceph-0.25.1.tar.gz -/ceph-0.26.tar.gz -/ceph-0.31.tar.gz -/ceph-0.37.tar.gz -/ceph-0.39.tar.gz -/ceph-0.43.tar.bz2 -/ceph-0.44.tar.bz2 -/ceph-0.45.tar.bz2 -/ceph-0.46.tar.bz2 -/ceph-0.51.tar.bz2 -/ceph-0.53.tar.bz2 -/ceph-0.56.3.tar.bz2 -/ceph-0.56.4.tar.bz2 -/ceph-0.61.7.tar.bz2 -/ceph-0.67.3.tar.bz2 -/ceph-0.72.2.tar.bz2 -/ceph-0.80.1.tar.bz2 +ceph-*.tar.* +*.src.rpm diff --git a/ceph.spec b/ceph.spec index 50f807e..8c6eb09 100644 --- a/ceph.spec +++ b/ceph.spec @@ -3,7 +3,7 @@ Name: ceph Version: 0.80.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: User space components of the Ceph file system License: LGPLv2 Group: System Environment/Base @@ -24,7 +24,9 @@ BuildRequires: cryptopp-devel, libatomic_ops-static, gcc-c++ BuildRequires: pkgconfig, libcurl-devel, keyutils-libs-devel BuildRequires: gtkmm24-devel, gtk2-devel, libuuid, libuuid-devel BuildRequires: leveldb-devel, snappy-devel, libblkid-devel +%if ( ! (0%{?rhel} && 0%{?rhel} <= 6 ) ) BuildRequires: xfsprogs-devel +%endif Requires(post): chkconfig, binutils, libedit Requires(preun): chkconfig @@ -95,6 +97,9 @@ EXTRA_LDFLAGS="-lpthread" %{configure} --prefix=%{_prefix} --sbindir=%{_sbindir} \ --localstatedir=%{_localstatedir} --sysconfdir=%{_sysconfdir} \ +%if ( 0%{?rhel} && 0%{?rhel} <= 6 ) +--without-libxfs \ +%endif %ifarch ppc ppc64 s390 s390x aarch64 --without-tcmalloc \ %endif @@ -177,6 +182,7 @@ fi %{_sbindir}/ceph-disk %{_sbindir}/ceph-disk-udev %{_libdir}/ceph +%exclude %{_libdir}/ceph/erasure-code %config(noreplace) %{_sysconfdir}/logrotate.d/ceph %config(noreplace) %{_sysconfdir}/bash_completion.d/rados %config(noreplace) %{_sysconfdir}/bash_completion.d/ceph @@ -290,6 +296,10 @@ fi %{_sysconfdir}/bash_completion.d/radosgw-admin %changelog +* Wed May 14 2014 Kaleb S. KEITHLEY - 0.80.1-2 +- build epel-6 +- exclude %%{_libdir}/ceph/erasure-code in base package + * Tue May 13 2014 Kaleb S. KEITHLEY - 0.80.1-1 - Update to latest stable upstream release, BZ 1095201 - PIE, _hardened_build, BZ 955174