Author: wiget Date: Wed Feb 25 13:15:36 2009 GMT
Module: SPECS Tag: HEAD
---- Log message:
- cleanup
- bcond openssl097 removed
---- Files affected:
SPECS:
python30.spec (1.11 -> 1.12)
---- Diffs:
================================================================
Index: SPECS/python30.spec
diff -u SPECS/python30.spec:1.11 SPECS/python30.spec:1.12
--- SPECS/python30.spec:1.11 Wed Feb 25 14:00:35 2009
+++ SPECS/python30.spec Wed Feb 25 14:15:31 2009
@@ -5,7 +5,6 @@
%bcond_without tkinter # disables tkinter module building
%bcond_without tests # disables Python testing
%bcond_with verbose_tests # runs tests in verbose mode
-%bcond_with openssl097
#
# tests which will not work on 64-bit platforms
%define no64bit_tests test_audioop test_rgbimg test_imageop
@@ -33,7 +32,7 @@
Summary(uk.UTF-8): Мова програмування дуже високого рівня з X-інтерфейсом
Name: python30
Version: %{py_ver}.1
-Release: 0.1
+Release: 0.2
Epoch: 1
License: PSF
Group: Applications
@@ -44,8 +43,6 @@
Patch3: %{name}-ac_fixes.patch
Patch4: %{name}-lib64.patch
Patch5: %{name}-noarch_to_datadir.patch
-Patch6: %{name}-doc_path.patch
-Patch7: %{name}-db4.6.patch
URL: http://www.python.org/
BuildRequires: autoconf
BuildRequires: bluez-libs-devel
@@ -59,11 +56,7 @@
BuildRequires: libffi-devel
BuildRequires: libstdc++-devel
BuildRequires: ncurses-ext-devel >= 5.2
-%if %{with openssl097}
-BuildRequires: openssl-devel < 0.9.8
-%else
BuildRequires: openssl-devel >= 0.9.8
-%endif
BuildRequires: readline-devel >= 5.0
BuildRequires: rpm-pythonprov
BuildRequires: sed >= 4.0
@@ -487,8 +480,6 @@
%patch3 -p1
%patch4 -p1
%patch5 -p1
-#patch6 -p1
-#patch7 -p1
%build
sed -i -e 's#-ltermcap#-ltinfo#g' configure*
@@ -593,7 +584,6 @@
for script in idle pydoc; do
mv $RPM_BUILD_ROOT%{_bindir}/${script}
$RPM_BUILD_ROOT%{_bindir}/${script}%{py_ver}
done
-#mv $RPM_BUILD_ROOT%{_mandir}/man1/python.1
$RPM_BUILD_ROOT%{_mandir}/man1/python%{py_ver}.1
# just to cut the noise, as they are not packaged (now)
# first tests
@@ -631,12 +621,10 @@
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/python%{py_ver}
%attr(755,root,root) %{_bindir}/2to3
-#%{_mandir}/man1/*
%files modules
%defattr(644,root,root,755)
/etc/shrc.d/python*-modules*
-#exclude %{py_scriptdir}/UserDict.py[co]
%exclude %{py_scriptdir}/codecs.py[co]
%exclude %{py_scriptdir}/copyreg.py[co]
%exclude %{py_scriptdir}/locale.py[co]
@@ -676,7 +664,6 @@
%attr(755,root,root) %{py_dyndir}/audioop.so
%attr(755,root,root) %{py_dyndir}/binascii.so
%attr(755,root,root) %{py_dyndir}/_bisect.so
-#%attr(755,root,root) %{py_dyndir}/_bsddb.so
%attr(755,root,root) %{py_dyndir}/bz2.so
%attr(755,root,root) %{py_dyndir}/cmath.so
%attr(755,root,root) %{py_dyndir}/_codecs_cn.so
@@ -687,7 +674,6 @@
%attr(755,root,root) %{py_dyndir}/_codecs_tw.so
%attr(755,root,root) %{py_dyndir}/_collections.so
%attr(755,root,root) %{py_dyndir}/crypt.so
-#%attr(755,root,root) %{py_dyndir}/cStringIO.so
%attr(755,root,root) %{py_dyndir}/_csv.so
%attr(755,root,root) %{py_dyndir}/_ctypes*.so
%attr(755,root,root) %{py_dyndir}/_curses_panel.so
@@ -704,11 +690,9 @@
%attr(755,root,root) %{py_dyndir}/_multiprocessing.so
%attr(755,root,root) %{py_dyndir}/_pickle.so
%attr(755,root,root) %{py_dyndir}/_random.so
-%{?with_openssl097:%attr(755,root,root) %{py_dyndir}/_sha*.so}
%attr(755,root,root) %{py_dyndir}/_socket.so
%attr(755,root,root) %{py_dyndir}/_ssl.so
%attr(755,root,root) %{py_dyndir}/_testcapi.so
-#%attr(755,root,root) %{py_dyndir}/_weakref.so
%ifnarch sparc64
%attr(755,root,root) %{py_dyndir}/_dbm.so
%endif
@@ -716,7 +700,6 @@
%attr(755,root,root) %{py_dyndir}/_gdbm.so
%attr(755,root,root) %{py_dyndir}/grp.so
%attr(755,root,root) %{py_dyndir}/itertools.so
-#%attr(755,root,root) %{py_dyndir}/linuxaudiodev.so
%attr(755,root,root) %{py_dyndir}/math.so
%attr(755,root,root) %{py_dyndir}/mmap.so
%attr(755,root,root) %{py_dyndir}/nis.so
@@ -727,7 +710,6 @@
%attr(755,root,root) %{py_dyndir}/readline.so
%attr(755,root,root) %{py_dyndir}/resource.so
%attr(755,root,root) %{py_dyndir}/select.so
-#%attr(755,root,root) %{py_dyndir}/strop.so
%attr(755,root,root) %{py_dyndir}/syslog.so
%attr(755,root,root) %{py_dyndir}/termios.so
%attr(755,root,root) %{py_dyndir}/time.so
@@ -738,12 +720,6 @@
%dir %{py_scriptdir}/plat-*
%{py_scriptdir}/plat-*/*.py[co]
-#%dir %{py_scriptdir}/bsddb
-#%{py_scriptdir}/bsddb/*.py[co]
-
-#%dir %{py_scriptdir}/compiler
-#%{py_scriptdir}/compiler/*.py[co]
-
%dir %{py_scriptdir}/ctypes
%dir %{py_scriptdir}/ctypes/macholib
@@ -837,7 +813,6 @@
%attr(755,root,root) %{py_dyndir}/_struct.so
# modules required by python library
-#%{py_scriptdir}/UserDict.py[co]
%{py_scriptdir}/codecs.py[co]
%{py_scriptdir}/copyreg.py[co]
%{py_scriptdir}/locale.py[co]
@@ -871,7 +846,6 @@
%files devel
%defattr(644,root,root,755)
%doc Misc/{ACKS,NEWS,README,README.valgrind,valgrind-python.supp}
-#%attr(755,root,root) %{_bindir}/python-config
%attr(755,root,root) %{_bindir}/python%{py_ver}-config
%attr(755,root,root) %{_libdir}/lib*.so
%dir %{py_incdir}
@@ -893,10 +867,8 @@
%defattr(644,root,root,755)
%attr(-,root,root) %{py_scriptdir}/*.py
%{py_scriptdir}/plat-*/*.py
-#%{py_scriptdir}/bsddb/*.py
%{py_scriptdir}/ctypes/*.py
%{py_scriptdir}/ctypes/macholib/*.py
-#%{py_scriptdir}/compiler/*.py
%{py_scriptdir}/curses/*.py
%{py_scriptdir}/dbm/*.py
%{py_scriptdir}/distutils/*.py
@@ -932,9 +904,6 @@
%attr(755,root,root) %{_bindir}/pygettext%{py_ver}
-#%attr(755,root,root) %{py_dyndir}/_hotshot.so
-#%dir %{py_scriptdir}/hotshot
-#%{py_scriptdir}/hotshot/*.py[co]
%{py_scriptdir}/pdb.py[co]
%{py_scriptdir}/profile.py[co]
%{py_scriptdir}/pstats.py[co]
@@ -948,11 +917,6 @@
%defattr(644,root,root,755)
%{_examplesdir}/%{name}-%{version}
-
-#%files doc
-#%defattr(644,root,root,755)
-#%doc Python-Docs-%{version}%{beta}/*
-
%if %{with info}
%files doc-info
%defattr(644,root,root,755)
@@ -973,6 +937,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.12 2009/02/25 13:15:31 wiget
+- cleanup
+- bcond openssl097 removed
+
Revision 1.11 2009/02/25 13:00:35 wiget
- garbage removed
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/python30.spec?r1=1.11&r2=1.12&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
