diff --git a/.gitignore b/.gitignore index b755ecb..0c23b98 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ snake-0.11-0.20.tar.bz2 +/snake-0.11.1.tar.bz2 diff --git a/snake.spec b/snake.spec index 6c54275..59bf58f 100644 --- a/snake.spec +++ b/snake.spec @@ -1,20 +1,19 @@ -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%{!?build_server: %global build_server %(%{__python} -c "import pykickstart.version;" 2>/dev/null && echo 1 || echo 0)} +%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%{!?build_server: %define build_server %(%{__python} -c "import pykickstart.version;" 2>/dev/null && echo 1 || echo 0)} Name: snake Summary: Smart Network Automated Kickstart Environment -Version: 0.11 -%global extraver 0.20 -Release: 4.%{extraver}%{?dist} -Source0: http://hosted.fedoraproject.org/projects/snake/SnakeReleases/%{name}-%{version}-%{extraver}.tar.bz2 +Version: 0.11.1 +Release: 1%{?dist} +Source0: https://fedorahosted.org/releases/s/n/%{name}/%{name}-%{version}.tar.bz2 License: GPLv2+ Group: Applications/Internet -URL: http://hosted.fedoraproject.org/projects/snake/ +URL: https://fedorahosted.org/snake Requires: yum, pax BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildArch: noarch BuildRequires: python-devel -%if 0%{?fedora} && 0%{?fedora} < 13 +%if 0%{?fedora} >= 8 BuildRequires: python-setuptools-devel %else BuildRequires: python-setuptools @@ -51,16 +50,16 @@ templates to snake-client systems %prep -%setup -q -n %{name}-%{version}-%{extraver} +%setup -q -n %{name}-%{version} %build -CFLAGS="$RPM_OPT_FLAGS" %{__python} -c 'import setuptools; execfile("setup.py")' build +CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build %install rm -rf $RPM_BUILD_ROOT -%{__python} -c 'import setuptools; execfile("setup.py")' install --skip-build --root $RPM_BUILD_ROOT +%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT/%{_localstatedir}/lib/snake install -d $RPM_BUILD_ROOT/%{_localstatedir}/lib/snake/{kickstarts,templates,trees,machines} @@ -140,6 +139,10 @@ fi %changelog +* Fri Aug 10 2012 James Laska 0.11.1-1 +- Update project and source code URL +- Correct upstream versioning + * Sat Jul 21 2012 Fedora Release Engineering - 0.11-4.0.20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index 40e7e6b..1b0537d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -645f6091ad4b9f2edc5e70e9f76488d9 snake-0.11-0.20.tar.bz2 +6fd3de3e655ec8e2857aed9fa6c77b62 snake-0.11.1.tar.bz2