Accepting request 531442 from home:AndreasStieger:branches:devel:tools:building
SCons 3.0.0 OBS-URL: https://build.opensuse.org/request/show/531442 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/scons?expand=0&rev=47
This commit is contained in:
parent
e66fade10a
commit
11743df095
@ -1,26 +0,0 @@
|
||||
---
|
||||
setup.py | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
Index: scons-2.4.0/setup.py
|
||||
===================================================================
|
||||
--- scons-2.4.0.orig/setup.py
|
||||
+++ scons-2.4.0/setup.py
|
||||
@@ -375,7 +375,7 @@ class install_data(_install_data):
|
||||
if is_win32:
|
||||
dir = 'Doc'
|
||||
else:
|
||||
- dir = os.path.join('man', 'man1')
|
||||
+ dir = os.path.join('share', 'man', 'man1')
|
||||
self.data_files = [(dir, man_pages)]
|
||||
man_dir = os.path.join(self.install_dir, dir)
|
||||
msg = "Installed SCons man pages into %s" % man_dir
|
||||
@@ -493,7 +493,7 @@ arguments = {
|
||||
'docbook-xsl-1.76.1/xhtml/*',
|
||||
'docbook-xsl-1.76.1/xhtml-1_1/*',
|
||||
'utils/*']},
|
||||
- 'data_files' : [('man/man1', man_pages)],
|
||||
+ 'data_files' : [('share/man/man1', man_pages)],
|
||||
'scripts' : scripts,
|
||||
'cmdclass' : {'install' : install,
|
||||
'install_lib' : install_lib,
|
@ -1,30 +0,0 @@
|
||||
Index: script/scons
|
||||
===================================================================
|
||||
--- script/scons.orig
|
||||
+++ script/scons
|
||||
@@ -1,4 +1,4 @@
|
||||
-#! /usr/bin/env python
|
||||
+#!/usr/bin/python
|
||||
#
|
||||
# SCons - a Software Constructor
|
||||
#
|
||||
Index: script/scons-time
|
||||
===================================================================
|
||||
--- script/scons-time.orig
|
||||
+++ script/scons-time
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/bin/env python
|
||||
+#!/usr/bin/python
|
||||
#
|
||||
# scons-time - run SCons timings and collect statistics
|
||||
#
|
||||
Index: script/sconsign
|
||||
===================================================================
|
||||
--- script/sconsign.orig
|
||||
+++ script/sconsign
|
||||
@@ -1,4 +1,4 @@
|
||||
-#! /usr/bin/env python
|
||||
+#!/usr/bin/python
|
||||
#
|
||||
# SCons - a Software Constructor
|
||||
#
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:0b25218ae7b46a967db42f2a53721645b3d42874a65f9552ad16ce26d30f51f2
|
||||
size 620909
|
26
scons-3.0.0-fix-install.patch
Normal file
26
scons-3.0.0-fix-install.patch
Normal file
@ -0,0 +1,26 @@
|
||||
---
|
||||
setup.py | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
Index: scons-3.0.0/setup.py
|
||||
===================================================================
|
||||
--- scons-3.0.0.orig/setup.py
|
||||
+++ scons-3.0.0/setup.py
|
||||
@@ -386,7 +386,7 @@ class install_data(_install_data):
|
||||
if is_win32:
|
||||
dir = 'Doc'
|
||||
else:
|
||||
- dir = os.path.join('man', 'man1')
|
||||
+ dir = os.path.join('share', 'man', 'man1')
|
||||
self.data_files = [(dir, man_pages)]
|
||||
man_dir = os.path.join(self.install_dir, dir)
|
||||
msg = "Installed SCons man pages into %s" % man_dir
|
||||
@@ -506,7 +506,7 @@ arguments = {
|
||||
'docbook-xsl-1.76.1/xhtml/*',
|
||||
'docbook-xsl-1.76.1/xhtml-1_1/*',
|
||||
'utils/*']},
|
||||
- 'data_files': [('man/man1', man_pages)],
|
||||
+ 'data_files': [('share/man/man1', man_pages)],
|
||||
'scripts': scripts,
|
||||
'cmdclass': {'install': install,
|
||||
'install_lib': install_lib,
|
3
scons-3.0.0.tar.gz
Normal file
3
scons-3.0.0.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:0f532f405b98c60b731d231b3c503ab5bf47d89a6f66f70cb62c9249e9f45216
|
||||
size 630418
|
@ -1,4 +0,0 @@
|
||||
# Source URL pointed to upstream release, tar.gz
|
||||
addFilter("W: source-or-patch-not-bzipped")
|
||||
# It's not really an extension/module (is it?)
|
||||
addFilter("W: python-naming-policy-not-applied")
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:6250b583d1d905b479bf75b7d1e48fda11009abfb10c41b8e7545e76472388ac
|
||||
size 152937
|
3
scons-user.html-3.0.0.tar.bz2
Normal file
3
scons-user.html-3.0.0.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:3e0198ce5b1b561a8ba6887be2b9eb38dac3c7b56d269188a9740252c3fdfe51
|
||||
size 153266
|
@ -1,3 +1,19 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Oct 4 18:49:41 UTC 2017 - astieger@suse.com
|
||||
|
||||
- SCons 3.0.0, a major release:
|
||||
* Some targets may rebuild when upgrading.
|
||||
* Significant changes in some python action signatures
|
||||
* Supports Python version earlier than 2.7 and 3.5+
|
||||
* Switching between PY 2.7 and PY 3.5, 3.6 will cause rebuilds
|
||||
* Updated language support: D, LaTeX, docbook
|
||||
* Remove deprecated tools CVS, Perforce, BitKeeper, RCS, SCCS, Subversion
|
||||
* Removed deprecated module SCons.Sig
|
||||
- refresh scons-1.2.0-fix-install.patch to
|
||||
scons-3.0.0-fix-install.patch
|
||||
- drop scons-1.2.0-noenv.patch, fix is done in spec
|
||||
- drop rpmlintrc, no longer needed
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 22 12:44:48 UTC 2016 - astieger@suse.com
|
||||
|
||||
|
10
scons.spec
10
scons.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package scons
|
||||
#
|
||||
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -22,7 +22,7 @@
|
||||
%{!?python_sitearch: %global python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
|
||||
%endif
|
||||
Name: scons
|
||||
Version: 2.5.1
|
||||
Version: 3.0.0
|
||||
Release: 0
|
||||
Summary: Replacement for Make
|
||||
License: MIT
|
||||
@ -31,11 +31,8 @@ Url: http://www.scons.org/
|
||||
Source0: http://prdownloads.sourceforge.net/scons/%{name}-%{version}.tar.gz
|
||||
#http://www.scons.org/doc/%%{version}/HTML/scons-user.html
|
||||
Source1: scons-user.html-%{version}.tar.bz2
|
||||
# rpmlintrc
|
||||
Source99: %{name}-rpmlintrc
|
||||
# Sets _mandir to _datadir/man instead of _prefix/man
|
||||
Patch0: %{name}-1.2.0-fix-install.patch
|
||||
Patch1: %{name}-1.2.0-noenv.patch
|
||||
Patch0: %{name}-3.0.0-fix-install.patch
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: python-devel >= 2.7
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
@ -56,7 +53,6 @@ full power of Python to control compilation.
|
||||
%prep
|
||||
%setup -q -a1
|
||||
%patch0 -p1
|
||||
%patch1 -p0
|
||||
|
||||
# fix libdir for qt
|
||||
patch -p0 <<EOF
|
||||
|
Loading…
Reference in New Issue
Block a user