OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/scons?expand=0&rev=3

scons-0.97-fix-install.patch

@@ -1,5 +1,5 @@
---- setup.py	2007-05-17 18:36:40.000000000 +0200
-+++ setup.py	2007-05-30 15:20:13.000000000 +0200
+--- setup.py
++++ setup.py
 @@ -336,7 +336,7 @@
              if is_win32:
                  dir = 'Doc'

scons-0.97-noenv.patch

@@ -0,0 +1,24 @@
+--- script/scons
++++ script/scons
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ #
+ # SCons - a Software Constructor
+ #
+--- script/scons-time
++++ script/scons-time
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+ #
+ # scons-time - run SCons timings and collect statistics
+ #
+--- script/sconsign
++++ script/sconsign
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#!/usr/bin/python
+ #
+ # SCons - a Software Constructor
+ #

scons.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Nov 12 15:13:24 CET 2007 - prusnak@suse.cz
+
+- replaced /usr/bin/env in shebang by /usr/bin/python (noenv.patch)
+- replaces duplicities in bindir by symlinks
+
 -------------------------------------------------------------------
 Wed May 30 15:22:18 CEST 2007 - ltinkl@suse.cz
 

scons.spec

@@ -12,24 +12,25 @@
 
 Name:           scons
 BuildRequires:  python-devel
-Summary:        Replacement for make
+Summary:        Replacement for Make
 Version:        0.97
-Release:        1
+Release:        46
 Source0:        %{name}-%{version}.tar.bz2
 Source1:        scons-user.html
-Patch1:         fix-install.patch
+Patch0:         %{name}-%{version}-fix-install.patch
+Patch1:         %{name}-%{version}-noenv.patch
 License:        X11/MIT
 Group:          Development/Tools/Building
-URL:            http://www.scons.org/
+Url:            http://www.scons.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %{py_requires}
 
 %description
 SCons is a make replacement that provides a range of enhanced features,
 such as automated dependency generation and built-in compilation cache
-support. SCons rule sets are Python scripts, so as well as the features
-it provides itself, SCons allows you to use the full power of Python to
-control compilation.
+support. SCons rule sets are Python scripts, which means that SCons
+provides itself as well as the features. SCons allows you to use the
+full power of Python to control compilation.
 
 
 
@@ -45,8 +46,10 @@ Authors:
     Christoph Wiedemann
 
 %prep
-%setup
+%setup -q
+%patch0
 %patch1
+# fix libdir for qt
 patch -p0 <<EOF
 --- engine/SCons/Tool/qt.py
 +++ engine/SCons/Tool/qt.py
@@ -54,14 +57,20 @@ patch -p0 <<EOF
 -                   QT_LIBPATH = os.path.join('\$QTDIR', 'lib'),
 +                   QT_LIBPATH = os.path.join('\$QTDIR', '%_lib'),
 EOF
-install %{SOURCE1} .
+# copy user guide
+cp %{SOURCE1} .
 
 %build
-export CFLAGS="$RPM_OPT_FLAGS" 
+export CFLAGS="$RPM_OPT_FLAGS"
 python setup.py build
 
 %install
-python setup.py install --prefix=%{_prefix} --root=$RPM_BUILD_ROOT --record-rpm=INSTALLED_FILES --install-lib=%{py_sitedir}
+python setup.py install --prefix=%{_prefix} --root=$RPM_BUILD_ROOT --install-lib=%{py_sitedir} --record-rpm=INSTALLED_FILES
+# fix duplicates in bindir
+ln -sf scons $RPM_BUILD_ROOT%{_bindir}/scons-%{version}
+ln -sf scons-time $RPM_BUILD_ROOT%{_bindir}/scons-time-%{version}
+ln -sf sconsign $RPM_BUILD_ROOT%{_bindir}/sconsign-%{version}
+# fix manpages
 sed -i -e 's,\.1$,.1.gz,' INSTALLED_FILES
 
 %clean
@@ -70,9 +79,10 @@ rm -rf $RPM_BUILD_ROOT
 %files -f INSTALLED_FILES 
 %defattr(-,root,root)
 %doc CHANGES.txt LICENSE.txt README.txt RELEASE.txt scons-user.html
-%doc /%{_mandir}/man1/* 
-
 %changelog
+* Mon Nov 12 2007 - prusnak@suse.cz
+- replaced /usr/bin/env in shebang by /usr/bin/python (noenv.patch)
+- replaces duplicities in bindir by symlinks
 * Wed May 30 2007 - ltinkl@suse.cz
 - update to stable release 0.97
 - fix man installation patch