diff --git a/cashe.spec b/cashe.spec index 64ce42aefa..83aa77325f 100644 --- a/cashe.spec +++ b/cashe.spec @@ -16,19 +16,17 @@ Summary: CAS (Content Addressable Storage) cache for your data/caches Name: cashe Version: 0.99.3 -Release: 6%{?dist} +Release: 7%{?dist} License: LGPLv2+ URL: https://github.com/james-antill/CAShe Source0: https://github.com/james-antill/%{gitname}/archive/%{commit}/%{gitname}-%{commit}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: python +BuildRequires: python2 BuildRequires: python2-devel BuildRequires: libxslt docbook-dtds docbook-style-xsl docbook-style-dsssl # CheckRequires BuildRequires: python-nose # Not sure how far back -Requires: python >= 2.4 -Requires: python-cashe = %{version}-%{release} +Requires: python2-cashe = %{version}-%{release} Provides: %{gitname} = %{version} BuildArchitectures: noarch @@ -37,12 +35,12 @@ CAShe is a CAS (Content Addressable Storage) cache for your data/caches. Everything that is stored in the CAShe can be deleted at any time, although that will mainly happen when cleanup operations are called or on failures. -%package -n python-cashe +%package -n python2-cashe +%{?python_provide:%python_provide python2-cashe} Summary: Python module for CAShe # Not sure how far back -Requires: python >= 2.4 -%description -n python-cashe +%description -n python2-cashe CAShe is a CAS (Content Addressable Storage) cache for your data/caches. Everything that is stored in the CAShe can be deleted at any time, although that will mainly happen when cleanup operations are called or on failures. @@ -51,14 +49,13 @@ that will mainly happen when cleanup operations are called or on failures. %setup -qn %{gitname}-%{commit} %build -make %{_smp_mflags} +%make_build %check make check %install -[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT install +%make_install mkdir -p $RPM_BUILD_ROOT/var/cache/CAShe # Ghost files ftw... @@ -68,12 +65,7 @@ mkdir $RPM_BUILD_ROOT/var/cache/CAShe/sha1 mkdir $RPM_BUILD_ROOT/var/cache/CAShe/sha256 mkdir $RPM_BUILD_ROOT/var/cache/CAShe/sha512 -%clean -rm -rf $RPM_BUILD_ROOT - - -%files -n python-cashe -%defattr(-,root,root,-) +%files -n python2-cashe %license LICENSE %doc README.md AUTHORS TODO DESIGN.md %{python_sitelib}/cashe @@ -90,6 +82,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Jul 29 2017 Zbigniew Jędrzejewski-Szmek - 0.99.3-7 +- Rename python subpackage to python2-cashe + * Wed Jul 26 2017 Fedora Release Engineering - 0.99.3-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild