[Python-checkins] python/dist/src/Misc/RPM python-2.3.spec, 1.2.12.13, 1.2.12.14

anthonybaxter at users.sourceforge.net anthonybaxter at users.sourceforge.net
Mon Jul 26 16:32:14 CEST 2004 

Update of /cvsroot/python/python/dist/src/Misc/RPM
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16773

Modified Files:
      Tag: release23-maint
	python-2.3.spec 
Log Message:
new .spec file, from #996316

Index: python-2.3.spec
===================================================================
RCS file: /cvsroot/python/python/dist/src/Misc/RPM/Attic/python-2.3.spec,v
retrieving revision 1.2.12.13
retrieving revision 1.2.12.14
diff -C2 -d -r1.2.12.13 -r1.2.12.14
*** python-2.3.spec	31 May 2004 19:38:08 -0000	1.2.12.13
--- python-2.3.spec	26 Jul 2004 14:32:11 -0000	1.2.12.14
***************
*** 26,29 ****
--- 26,32 ----
  %define config_ipv6 no
  
+ #  Location of the HTML directory.
+ %define config_htmldir /var/www/html/python
+ 
  #################################
  #  End of user-modifiable configs
***************
*** 33,37 ****
  %define version 2.3.4
  %define libvers 2.3
! %define release 2pydotorg
  %define __prefix /usr
  
--- 36,40 ----
  %define version 2.3.4
  %define libvers 2.3
! %define release 3pydotorg
  %define __prefix /usr
  
***************
*** 41,44 ****
--- 44,48 ----
  %define binsuffix %(if [ "%{config_binsuffix}" = none ]; then echo ; else echo "%{config_binsuffix}"; fi)
  %define include_tkinter %(if [ \\( "%{config_tkinter}" = auto -a -f /usr/bin/wish \\) -o "%{config_tkinter}" = yes ]; then echo 1; else echo 0; fi)
+ %define libdirname %(( uname -m | egrep -q '_64$' && [ -d /usr/lib64 ] && echo lib64 ) || echo lib)
  
  #  detect if documentation is available
***************
*** 128,131 ****
--- 132,141 ----
  
  %changelog
+ * Thu Jul 22 2004 Sean Reifschneider <jafo-rpms at tummy.com> [2.3.4-3pydotorg]
+ - Paul Tiemann fixes for %{prefix}.
+ - Adding permission changes for directory as suggested by reimeika.ca
+ - Adding code to detect when it should be using lib64.
+ - Adding a define for the location of /var/www/html for docs.
+ 
  * Thu May 27 2004 Sean Reifschneider <jafo-rpms at tummy.com> [2.3.4-2pydotorg]
  - Including changes from Ian Holsman to build under Red Hat 7.3.
***************
*** 214,221 ****
  #  set the install path
  echo '[install_scripts]' >setup.cfg
! echo 'install_dir='"${RPM_BUILD_ROOT}/usr/bin" >>setup.cfg
  
  [ -d "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
! mkdir -p $RPM_BUILD_ROOT%{__prefix}/lib/python%{libvers}/lib-dynload
  make prefix=$RPM_BUILD_ROOT%{__prefix} install
  
--- 224,231 ----
  #  set the install path
  echo '[install_scripts]' >setup.cfg
! echo 'install_dir='"${RPM_BUILD_ROOT}%{__prefix}/bin" >>setup.cfg
  
  [ -d "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
! mkdir -p $RPM_BUILD_ROOT%{__prefix}/%{libdirname}/python%{libvers}/lib-dynload
  make prefix=$RPM_BUILD_ROOT%{__prefix} install
  
***************
*** 226,230 ****
        cd $RPM_BUILD_ROOT%{__prefix}/bin
        mv pydoc pydoc.old
!       sed 's|#!.*|#!/usr/bin/env python'%{binsuffix}'|' \
              pydoc.old >pydoc
        chmod 755 pydoc
--- 236,240 ----
        cd $RPM_BUILD_ROOT%{__prefix}/bin
        mv pydoc pydoc.old
!       sed 's|#!.*|#!%{__prefix}/bin/env python'%{binsuffix}'|' \
              pydoc.old >pydoc
        chmod 755 pydoc
***************
*** 245,256 ****
  ########
  #  Tools
! echo '#!/bin/bash' >${RPM_BUILD_ROOT}%{_bindir}/idle%{binsuffix}
! echo 'exec %{__prefix}/bin/python%{binsuffix} /usr/lib/python%{libvers}/idlelib/idle.py' >>$RPM_BUILD_ROOT%{_bindir}/idle%{binsuffix}
! chmod 755 $RPM_BUILD_ROOT%{_bindir}/idle%{binsuffix}
! cp -a Tools $RPM_BUILD_ROOT%{__prefix}/lib/python%{libvers}
  
  #  MAKE FILE LISTS
  rm -f mainpkg.files
! find "$RPM_BUILD_ROOT""%{__prefix}"/lib/python%{libvers}/lib-dynload -type f |
  	sed "s|^${RPM_BUILD_ROOT}|/|" |
  	grep -v -e '_tkinter.so$' >mainpkg.files
--- 255,266 ----
  ########
  #  Tools
! echo '#!/bin/bash' >${RPM_BUILD_ROOT}%{__prefix}/bin/idle%{binsuffix}
! echo 'exec %{__prefix}/bin/python%{binsuffix} %{__prefix}/%{libdirname}/python%{libvers}/idlelib/idle.py' >>$RPM_BUILD_ROOT%{__prefix}/bin/idle%{binsuffix}
! chmod 755 $RPM_BUILD_ROOT%{__prefix}/bin/idle%{binsuffix}
! cp -a Tools $RPM_BUILD_ROOT%{__prefix}/%{libdirname}/python%{libvers}
  
  #  MAKE FILE LISTS
  rm -f mainpkg.files
! find "$RPM_BUILD_ROOT""%{__prefix}"/%{libdirname}/python%{libvers}/lib-dynload -type f |
  	sed "s|^${RPM_BUILD_ROOT}|/|" |
  	grep -v -e '_tkinter.so$' >mainpkg.files
***************
*** 260,265 ****
  
  rm -f tools.files
! find "$RPM_BUILD_ROOT""%{__prefix}"/lib/python%{libvers}/idlelib \
!       "$RPM_BUILD_ROOT""%{__prefix}"/lib/python%{libvers}/Tools -type f |
        sed "s|^${RPM_BUILD_ROOT}|/|" >tools.files
  echo "%{__prefix}"/bin/idle%{binsuffix} >>tools.files
--- 270,275 ----
  
  rm -f tools.files
! find "$RPM_BUILD_ROOT""%{__prefix}"/%{libdirname}/python%{libvers}/idlelib \
!       "$RPM_BUILD_ROOT""%{__prefix}"/%{libdirname}/python%{libvers}/Tools -type f |
        sed "s|^${RPM_BUILD_ROOT}|/|" >tools.files
  echo "%{__prefix}"/bin/idle%{binsuffix} >>tools.files
***************
*** 268,274 ****
  # Docs
  %if %{include_docs}
! mkdir -p "$RPM_BUILD_ROOT"/var/www/html/python
  (
!    cd "$RPM_BUILD_ROOT"/var/www/html/python
     bunzip2 < %{SOURCE1} | tar x
  )
--- 278,284 ----
  # Docs
  %if %{include_docs}
! mkdir -p "$RPM_BUILD_ROOT"%{config_htmldir}
  (
!    cd "$RPM_BUILD_ROOT"%{config_htmldir}
     bunzip2 < %{SOURCE1} | tar x
  )
***************
*** 280,284 ****
  do
     FIXFILE="$file"
!    sed 's|^#!.*python|#!/usr/bin/env python'"%{binsuffix}"'|' \
           "$FIXFILE" >/tmp/fix-python-path.$$
     cat /tmp/fix-python-path.$$ >"$FIXFILE"
--- 290,294 ----
  do
     FIXFILE="$file"
!    sed 's|^#!.*python|#!%{__prefix}/bin/env python'"%{binsuffix}"'|' \
           "$FIXFILE" >/tmp/fix-python-path.$$
     cat /tmp/fix-python-path.$$ >"$FIXFILE"
***************
*** 322,349 ****
  %{__prefix}/man/man1/python%{binsuffix}.1*
  
! %dir %{__prefix}/include/python%{libvers}
! %dir %{__prefix}/lib/python%{libvers}/
! %{__prefix}/lib/python%{libvers}/*.txt
! %{__prefix}/lib/python%{libvers}/*.py*
! %{__prefix}/lib/python%{libvers}/pdb.doc
! %{__prefix}/lib/python%{libvers}/profile.doc
! %{__prefix}/lib/python%{libvers}/curses
! %{__prefix}/lib/python%{libvers}/distutils
! %{__prefix}/lib/python%{libvers}/encodings
! %{__prefix}/lib/python%{libvers}/plat-linux2
! %{__prefix}/lib/python%{libvers}/site-packages
! %{__prefix}/lib/python%{libvers}/test
! %{__prefix}/lib/python%{libvers}/xml
! %{__prefix}/lib/python%{libvers}/email
! %{__prefix}/lib/python%{libvers}/compiler
! %{__prefix}/lib/python%{libvers}/bsddb
! %{__prefix}/lib/python%{libvers}/hotshot
! %{__prefix}/lib/python%{libvers}/logging
! %{__prefix}/lib/python%{libvers}/lib-old
  
  %files devel
  %defattr(-,root,root)
  %{__prefix}/include/python%{libvers}/*.h
! %{__prefix}/lib/python%{libvers}/config
  
  %files -f tools.files tools
--- 332,359 ----
  %{__prefix}/man/man1/python%{binsuffix}.1*
  
! %attr(755,root,root) %dir %{__prefix}/include/python%{libvers}
! %attr(755,root,root) %dir %{__prefix}/%{libdirname}/python%{libvers}/
! %{__prefix}/%{libdirname}/python%{libvers}/*.txt
! %{__prefix}/%{libdirname}/python%{libvers}/*.py*
! %{__prefix}/%{libdirname}/python%{libvers}/pdb.doc
! %{__prefix}/%{libdirname}/python%{libvers}/profile.doc
! %{__prefix}/%{libdirname}/python%{libvers}/curses
! %{__prefix}/%{libdirname}/python%{libvers}/distutils
! %{__prefix}/%{libdirname}/python%{libvers}/encodings
! %{__prefix}/%{libdirname}/python%{libvers}/plat-linux2
! %{__prefix}/%{libdirname}/python%{libvers}/site-packages
! %{__prefix}/%{libdirname}/python%{libvers}/test
! %{__prefix}/%{libdirname}/python%{libvers}/xml
! %{__prefix}/%{libdirname}/python%{libvers}/email
! %{__prefix}/%{libdirname}/python%{libvers}/compiler
! %{__prefix}/%{libdirname}/python%{libvers}/bsddb
! %{__prefix}/%{libdirname}/python%{libvers}/hotshot
! %{__prefix}/%{libdirname}/python%{libvers}/logging
! %{__prefix}/%{libdirname}/python%{libvers}/lib-old
  
  %files devel
  %defattr(-,root,root)
  %{__prefix}/include/python%{libvers}/*.h
! %{__prefix}/%{libdirname}/python%{libvers}/config
  
  %files -f tools.files tools
***************
*** 353,358 ****
  %files tkinter
  %defattr(-,root,root)
! %{__prefix}/lib/python%{libvers}/lib-tk
! %{__prefix}/lib/python%{libvers}/lib-dynload/_tkinter.so*
  %endif
  
--- 363,368 ----
  %files tkinter
  %defattr(-,root,root)
! %{__prefix}/%{libdirname}/python%{libvers}/lib-tk
! %{__prefix}/%{libdirname}/python%{libvers}/lib-dynload/_tkinter.so*
  %endif
  
***************
*** 360,363 ****
  %files docs
  %defattr(-,root,root)
! /var/www/html/python/*
  %endif
--- 370,373 ----
  %files docs
  %defattr(-,root,root)
! %{config_htmldir}/*
  %endif

More information about the Python-checkins mailing list