Ignore:
Timestamp:
Jul 9, 2009, 3:35:24 PM (15 years ago)
Author:
mitchb
Message:
Merge r1250:1257 from trunk to branches/fc11-dev (final merge)
Location:
branches/fc11-dev
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/fc11-dev

  • branches/fc11-dev/server/common/oursrc/php_scripts/php_scripts-config.m4

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • branches/fc11-dev/server/fedora/specs/scripts-python-path.spec

    r957 r1258  
    1717%prep
    1818%setup -q -n %{name}
     19%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
    1920
    2021%install
    2122[ $RPM_BUILD_ROOT != / ] && rm -rf $RPM_BUILD_ROOT
    22 install -D 00scripts-home.pth $RPM_BUILD_ROOT/usr/lib/python2.5/site-packages
     23install -d $RPM_BUILD_ROOT%{python_sitelib}
     24install -m 644 00scripts-home.pth $RPM_BUILD_ROOT%{python_sitelib}
    2325
    2426%clean
     
    2729%files
    2830%defattr(0644, root, root)
    29 /usr/lib/python2.5/site-packages/00scripts-home.pth
     31%{python_sitelib}/00scripts-home.pth
    3032
    3133%changelog
     34* Thu Jul  9 2009  Geoffrey Thomas <geofft@mit.edu>
     35- Update to Python 2.6
    3236* Tue Jan 27 2009  Quentin Smith <quentin@mit.edu>
    3337- initial release
Note: See TracChangeset for help on using the changeset viewer.