rpms/scons/devel scons.spec,1.3,1.4
Michael Schwendt (mschwendt)
fedora-extras-commits at redhat.com
Tue Jan 25 18:38:25 UTC 2005
Author: mschwendt
Update of /cvs/extras/rpms/scons/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv25236
Modified Files:
scons.spec
Log Message:
Fix from Thorsten for #146014.
Index: scons.spec
===================================================================
RCS file: /cvs/extras/rpms/scons/devel/scons.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- scons.spec 11 Nov 2004 19:21:37 -0000 1.3
+++ scons.spec 25 Jan 2005 18:38:23 -0000 1.4
@@ -1,6 +1,6 @@
Name: scons
Version: 0.96
-Release: 3
+Release: 4
Summary: An Open Source software construction tool
Group: Development/Tools
@@ -8,8 +8,9 @@
URL: http://www.scons.org/
Source: http://download.sourceforge.net/scons/scons-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch: noarch
+BuildArch: noarch
BuildRequires: python-devel
+Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
%description
SCons is an Open Source software construction tool--that is, a build
@@ -31,11 +32,11 @@
%build
-python setup.py build
+CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
%install
rm -rf $RPM_BUILD_ROOT
-python setup.py install --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES --install-lib=%{_libdir}/scons --install-scripts=%{_bindir}
+%{__python} setup.py install --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES --install-lib=%{_prefix}/lib/scons --install-scripts=%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
cp -f scons.1 sconsign.1 $RPM_BUILD_ROOT%{_mandir}/man1
@@ -46,10 +47,14 @@
%defattr(-,root,root,-)
%doc CHANGES.txt LICENSE.txt README.txt RELEASE.txt
%{_bindir}/*
-%{_libdir}/scons
+%{_prefix}/lib/scons
%{_mandir}/man*/*
%changelog
+* Tue Jan 25 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> 0.96-4
+- Place libs in {_prefix}/lib/ and not in {libdir}; fixes x86_64 problems
+- Adjust minor bits to be in sync with python-spec-template
+
* Wed Nov 10 2004 Matthias Saou <http://freshrpms.net/> 0.96-3
- Bump release to provide Extras upgrade path.
@@ -62,3 +67,4 @@
* Fri Nov 7 2003 Gerard Milmeister <gemi at bluewin.ch> - 0:0.93-0.fdr.1
- First Fedora release
+
More information about the fedora-extras-commits
mailing list