rpms/scons/F-13 .cvsignore, 1.12, 1.13 scons.spec, 1.25, 1.26 sources, 1.12, 1.13

[supercyper]

Author: supercyper

Update of /cvs/pkgs/rpms/scons/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv14983

Modified Files:
	.cvsignore scons.spec sources 
Log Message:
Sync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/scons/F-13/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	26 Dec 2008 06:49:54 -0000	1.12
+++ .cvsignore	8 Jul 2010 06:17:28 -0000	1.13
@@ -1 +1 @@
-scons-1.2.0.tar.gz
+scons-2.0.0.final.0.tar.gz


Index: scons.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scons/F-13/scons.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- scons.spec	27 Jul 2009 03:59:19 -0000	1.25
+++ scons.spec	8 Jul 2010 06:17:29 -0000	1.26
@@ -1,18 +1,16 @@
-Name:           scons
-Version:        1.2.0
-Release:        3%{?dist}
-
-Summary:        An Open Source software construction tool
-
-Group:          Development/Tools
-License:        MIT
-URL:            http://www.scons.org
-Source:         http://prdownloads.sourceforge.net/scons/scons-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:      noarch
-BuildRequires:  python-devel
-BuildRequires:  sed
+%global posttag .final.0
 
+Name:		scons
+Version:	2.0.0
+Release:	1%{?posttag}%{?dist}
+Summary:	An Open Source software construction tool
+Group:		Development/Tools
+License:	MIT
+URL:		http://www.scons.org
+Source:		http://downloads.sourceforge.net/scons/scons-%{version}%{?posttag}.tar.gz
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch:	noarch
+BuildRequires:	python2-devel
 
 %description
 SCons is an Open Source software construction tool--that is, a build
@@ -29,37 +27,38 @@ really changed, not just when the timest
 supports side-by-side variant builds, and is easily extended with user-
 defined Builder and/or Scanner objects.
 
-
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}%{?posttag}
 sed -i 's|/usr/bin/env python|/usr/bin/python|' script/*
-
+# Convert to utf-8
+for file in *.txt; do
+    iconv -f ISO-8859-1 -t UTF-8 -o $file.new $file && \
+    touch -r $file $file.new && \
+    mv $file.new $file
+done
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
-
-
+python setup.py build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__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}
-mv $RPM_BUILD_ROOT%{_prefix}/man/* $RPM_BUILD_ROOT%{_mandir}
-
-
+python setup.py install -O1 --skip-build --root=$RPM_BUILD_ROOT --no-version-script \
+	--standalone-lib --install-scripts=%{_bindir} --install-data=%{_datadir}
+ 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %files
 %defattr(-,root,root,-)
 %doc CHANGES.txt LICENSE.txt README.txt RELEASE.txt
 %{_bindir}/*
 %{_prefix}/lib/scons
-%{_mandir}/man*/*
-
+%{_mandir}/man?/*
 
 %changelog
+* Thu Jul 08 2010 Chen Lei <supercyper at 163.com> - 2.0.0-1.final.0
+- new release 2.0.0.final.0
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
@@ -115,15 +114,3 @@ rm -rf $RPM_BUILD_ROOT
 * 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.
-
-* Thu Aug 19 2004 Gerard Milmeister <gemi at bluewin.ch> - 0:0.96-0.fdr.1
-- New Version 0.96
-
-* Thu Apr 15 2004 Gerard Milmeister <gemi at bluewin.ch> - 0:0.95-0.fdr.1
-- New Version 0.95
-
-* Fri Nov  7 2003 Gerard Milmeister <gemi at bluewin.ch> - 0:0.93-0.fdr.1
-- First Fedora release


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/scons/F-13/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	26 Dec 2008 06:49:55 -0000	1.12
+++ sources	8 Jul 2010 06:17:29 -0000	1.13
@@ -1 +1 @@
-53b6aa7281811717a57598e319441cf7  scons-1.2.0.tar.gz
+c2e4c2700cac507caa93d4a3adbbf56f  scons-2.0.0.final.0.tar.gz