New upstream version.
This commit is contained in:
parent
0552dafe05
commit
ffeda66855
2
.gitignore
vendored
2
.gitignore
vendored
@ -1,4 +1,4 @@
|
|||||||
/networkx-1.6.tar.gz
|
|
||||||
/networkx_reference.pdf
|
/networkx_reference.pdf
|
||||||
/networkx_tutorial.pdf
|
/networkx_tutorial.pdf
|
||||||
/networkx-documentation.zip
|
/networkx-documentation.zip
|
||||||
|
/networkx-1.7.tar.gz
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
Name: python-networkx
|
Name: python-networkx
|
||||||
Version: 1.6
|
Version: 1.7
|
||||||
Release: 3%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: Creates and Manipulates Graphs and Networks
|
Summary: Creates and Manipulates Graphs and Networks
|
||||||
Group: Development/Languages
|
Group: Development/Languages
|
||||||
License: BSD
|
License: BSD
|
||||||
@ -87,7 +87,7 @@ done
|
|||||||
cd ..
|
cd ..
|
||||||
|
|
||||||
%build
|
%build
|
||||||
python setup.py build
|
python2 setup.py build
|
||||||
PYTHONPATH=`pwd`/build/lib make -C doc html
|
PYTHONPATH=`pwd`/build/lib make -C doc html
|
||||||
|
|
||||||
# Setup for python3
|
# Setup for python3
|
||||||
@ -108,16 +108,27 @@ mv build2 build
|
|||||||
mv -f build/*.pyc networkx
|
mv -f build/*.pyc networkx
|
||||||
|
|
||||||
# Install the python2 version
|
# Install the python2 version
|
||||||
python setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
|
python2 setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
|
||||||
mv $RPM_BUILD_ROOT%{_docdir}/networkx-%{version} ./installed-docs
|
mv $RPM_BUILD_ROOT%{_docdir}/networkx-%{version} ./installed-docs
|
||||||
rm -f installed-docs/INSTALL.txt
|
rm -f installed-docs/INSTALL.txt
|
||||||
|
|
||||||
# Fix permissions
|
# Fix permissions and binary paths
|
||||||
grep -FRl /usr/bin/env $RPM_BUILD_ROOT%{python_sitelib} | xargs chmod a+x
|
for f in `grep -FRl /usr/bin/env $RPM_BUILD_ROOT%{python2_sitelib}`; do
|
||||||
grep -FRl /usr/bin/env $RPM_BUILD_ROOT%{python3_sitelib} | xargs chmod a+x
|
sed 's|/usr/bin/env python|%{_bindir}/python2|' $f > $f.new
|
||||||
|
touch -r $f $f.new
|
||||||
|
chmod a+x $f.new
|
||||||
|
mv -f $f.new $f
|
||||||
|
done
|
||||||
|
|
||||||
|
for f in `grep -FRl /usr/bin/env $RPM_BUILD_ROOT%{python3_sitelib}`; do
|
||||||
|
sed 's|/usr/bin/env python|%{_bindir}/python3|' $f > $f.new
|
||||||
|
touch -r $f $f.new
|
||||||
|
chmod a+x $f.new
|
||||||
|
mv -f $f.new $f
|
||||||
|
done
|
||||||
|
|
||||||
# Except unfix the one where the shebang was muffed
|
# Except unfix the one where the shebang was muffed
|
||||||
chmod a-x $RPM_BUILD_ROOT%{python_sitelib}/networkx/algorithms/link_analysis/hits_alg.py
|
chmod a-x $RPM_BUILD_ROOT%{python2_sitelib}/networkx/algorithms/link_analysis/hits_alg.py
|
||||||
chmod a-x $RPM_BUILD_ROOT%{python3_sitelib}/networkx/algorithms/link_analysis/hits_alg.py
|
chmod a-x $RPM_BUILD_ROOT%{python3_sitelib}/networkx/algorithms/link_analysis/hits_alg.py
|
||||||
|
|
||||||
|
|
||||||
@ -133,7 +144,7 @@ PYTHONPATH=`pwd`/site-packages python -c "import networkx; networkx.test()"
|
|||||||
|
|
||||||
%files
|
%files
|
||||||
%doc installed-docs/*
|
%doc installed-docs/*
|
||||||
%{python_sitelib}/*
|
%{python2_sitelib}/*
|
||||||
|
|
||||||
|
|
||||||
%files -n python3-networkx
|
%files -n python3-networkx
|
||||||
@ -146,6 +157,9 @@ PYTHONPATH=`pwd`/site-packages python -c "import networkx; networkx.test()"
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Aug 6 2012 Jerry James <loganjerry@gmail.com> - 1.7-1
|
||||||
|
- New upstream version
|
||||||
|
|
||||||
* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6-3
|
* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6-3
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||||
|
|
||||||
|
|||||||
8
sources
8
sources
@ -1,4 +1,4 @@
|
|||||||
a5e62b841b30118574b57d0eaf1917ca networkx-1.6.tar.gz
|
1a73da9d571a206aa40f6ef69254f7b4 networkx-1.7.tar.gz
|
||||||
b1e3d5d4825c22f542cb427653b185c5 networkx_reference.pdf
|
5c74458f88c8290616f1b0ce4d1d1db3 networkx_reference.pdf
|
||||||
39f248167e2c800bd1d4d9004cb637b5 networkx_tutorial.pdf
|
91cf17ce3c5ec23dfa7e1a00eaf8c564 networkx_tutorial.pdf
|
||||||
c9a42bda38401a8d59cd1bc8c4ea8d41 networkx-documentation.zip
|
0b374fb1b50ba62ec37f2f9baf0a4691 networkx-documentation.zip
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user