From 3a198a19d4178aab2fcb4a86e12ed11098e239ed Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Feb 25 2010 17:07:10 +0000 Subject: Update to 0.9.6. --- diff --git a/.cvsignore b/.cvsignore index c45835f..ebf5b1c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -cssutils-0.9.5.1.zip +cssutils-0.9.6.zip diff --git a/cssutils-0.9.5.1-nohashbang.patch b/cssutils-0.9.5.1-nohashbang.patch deleted file mode 100644 index 542d5ac..0000000 --- a/cssutils-0.9.5.1-nohashbang.patch +++ /dev/null @@ -1,94 +0,0 @@ -diff -Naupr cssutils-0.9.5.1.orig/src/cssutils/codec.py cssutils-0.9.5.1/src/cssutils/codec.py ---- cssutils-0.9.5.1.orig/src/cssutils/codec.py 2008-08-09 21:17:48.000000000 +0200 -+++ cssutils-0.9.5.1/src/cssutils/codec.py 2008-08-19 15:28:25.000000000 +0200 -@@ -1,4 +1,3 @@ --#!/usr/bin/env python - """Python codec for CSS.""" - __docformat__ = 'restructuredtext' - __author__ = 'Walter Doerwald' -diff -Naupr cssutils-0.9.5.1.orig/src/cssutils/errorhandler.py cssutils-0.9.5.1/src/cssutils/errorhandler.py ---- cssutils-0.9.5.1.orig/src/cssutils/errorhandler.py 2008-07-29 21:36:26.000000000 +0200 -+++ cssutils-0.9.5.1/src/cssutils/errorhandler.py 2008-08-19 15:28:33.000000000 +0200 -@@ -1,4 +1,3 @@ --#!/usr/bin/env python - """cssutils ErrorHandler - - ErrorHandler -diff -Naupr cssutils-0.9.5.1.orig/src/cssutils/__init__.py cssutils-0.9.5.1/src/cssutils/__init__.py ---- cssutils-0.9.5.1.orig/src/cssutils/__init__.py 2008-08-11 20:11:24.000000000 +0200 -+++ cssutils-0.9.5.1/src/cssutils/__init__.py 2008-08-19 15:28:43.000000000 +0200 -@@ -1,4 +1,3 @@ --#!/usr/bin/env python - """cssutils - CSS Cascading Style Sheets library for Python - - Copyright (C) 2004-2008 Christof Hoeke -diff -Naupr cssutils-0.9.5.1.orig/src/cssutils/parse.py cssutils-0.9.5.1/src/cssutils/parse.py ---- cssutils-0.9.5.1.orig/src/cssutils/parse.py 2008-08-09 21:27:52.000000000 +0200 -+++ cssutils-0.9.5.1/src/cssutils/parse.py 2008-08-19 15:28:49.000000000 +0200 -@@ -1,4 +1,3 @@ --#!/usr/bin/env python - """a validating CSSParser - """ - __all__ = ['CSSParser'] -diff -Naupr cssutils-0.9.5.1.orig/src/cssutils/scripts/csscapture.py cssutils-0.9.5.1/src/cssutils/scripts/csscapture.py ---- cssutils-0.9.5.1.orig/src/cssutils/scripts/csscapture.py 2008-07-09 15:12:56.000000000 +0200 -+++ cssutils-0.9.5.1/src/cssutils/scripts/csscapture.py 2008-08-19 15:29:04.000000000 +0200 -@@ -1,4 +1,3 @@ --#!/usr/bin/env python - """Retrieve all CSS stylesheets including embedded for a given URL. - Retrieve as StyleSheetList or save to disk - raw, parsed or minified version. - -diff -Naupr cssutils-0.9.5.1.orig/src/cssutils/scripts/csscombine.py cssutils-0.9.5.1/src/cssutils/scripts/csscombine.py ---- cssutils-0.9.5.1.orig/src/cssutils/scripts/csscombine.py 2008-07-09 15:12:56.000000000 +0200 -+++ cssutils-0.9.5.1/src/cssutils/scripts/csscombine.py 2008-08-19 15:29:12.000000000 +0200 -@@ -1,4 +1,3 @@ --#!/usr/bin/env python - """Combine sheets referred to by @import rules in a given CSS proxy sheet - into a single new sheet. - -@@ -87,4 +86,4 @@ def main(args=None): - - - if __name__ == '__main__': -- sys.exit(main()) -\ No newline at end of file -+ sys.exit(main()) -diff -Naupr cssutils-0.9.5.1.orig/src/cssutils/scripts/cssparse.py cssutils-0.9.5.1/src/cssutils/scripts/cssparse.py ---- cssutils-0.9.5.1.orig/src/cssutils/scripts/cssparse.py 2008-07-08 23:17:10.000000000 +0200 -+++ cssutils-0.9.5.1/src/cssutils/scripts/cssparse.py 2008-08-19 15:29:22.000000000 +0200 -@@ -1,4 +1,3 @@ --#!/usr/bin/env python - """utility script to parse given filenames or string - """ - __docformat__ = 'restructuredtext' -diff -Naupr cssutils-0.9.5.1.orig/src/cssutils/serialize.py cssutils-0.9.5.1/src/cssutils/serialize.py ---- cssutils-0.9.5.1.orig/src/cssutils/serialize.py 2008-08-09 21:28:06.000000000 +0200 -+++ cssutils-0.9.5.1/src/cssutils/serialize.py 2008-08-19 15:29:28.000000000 +0200 -@@ -1,4 +1,3 @@ --#!/usr/bin/env python - # -*- coding: utf-8 -*- - """serializer classes for CSS classes - -diff -Naupr cssutils-0.9.5.1.orig/src/cssutils/tokenize2.py cssutils-0.9.5.1/src/cssutils/tokenize2.py ---- cssutils-0.9.5.1.orig/src/cssutils/tokenize2.py 2008-08-09 21:28:36.000000000 +0200 -+++ cssutils-0.9.5.1/src/cssutils/tokenize2.py 2008-08-19 15:29:36.000000000 +0200 -@@ -1,4 +1,3 @@ --#!/usr/bin/env python - # -*- coding: utf-8 -*- - """New CSS Tokenizer (a generator) - """ -diff -Naupr cssutils-0.9.5.1.orig/src/encutils/__init__.py cssutils-0.9.5.1/src/encutils/__init__.py ---- cssutils-0.9.5.1.orig/src/encutils/__init__.py 2008-03-19 21:18:06.000000000 +0100 -+++ cssutils-0.9.5.1/src/encutils/__init__.py 2008-08-19 15:29:47.000000000 +0200 -@@ -1,4 +1,3 @@ --#!/usr/bin/env python - """encutils - encoding detection collection for Python - - encutils -@@ -652,4 +651,4 @@ def getEncodingInfo(response=None, text= - - if __name__ == '__main__': - import pydoc -- pydoc.help(__name__) -\ No newline at end of file -+ pydoc.help(__name__) diff --git a/cssutils-0.9.6-nohashbang.patch b/cssutils-0.9.6-nohashbang.patch new file mode 100644 index 0000000..42afe84 --- /dev/null +++ b/cssutils-0.9.6-nohashbang.patch @@ -0,0 +1,86 @@ +diff -Naupr cssutils-0.9.6.orig/src/cssutils/codec.py cssutils-0.9.6/src/cssutils/codec.py +--- cssutils-0.9.6.orig/src/cssutils/codec.py 2009-01-13 21:38:22.000000000 +0100 ++++ cssutils-0.9.6/src/cssutils/codec.py 2010-02-25 13:38:49.721418711 +0100 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python + """Python codec for CSS.""" + __docformat__ = 'restructuredtext' + __author__ = 'Walter Doerwald' +diff -Naupr cssutils-0.9.6.orig/src/cssutils/errorhandler.py cssutils-0.9.6/src/cssutils/errorhandler.py +--- cssutils-0.9.6.orig/src/cssutils/errorhandler.py 2009-07-29 15:11:52.000000000 +0200 ++++ cssutils-0.9.6/src/cssutils/errorhandler.py 2010-02-25 13:39:07.963419983 +0100 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python + """cssutils ErrorHandler + + ErrorHandler +diff -Naupr cssutils-0.9.6.orig/src/cssutils/__init__.py cssutils-0.9.6/src/cssutils/__init__.py +--- cssutils-0.9.6.orig/src/cssutils/__init__.py 2009-10-07 17:28:20.000000000 +0200 ++++ cssutils-0.9.6/src/cssutils/__init__.py 2010-02-25 13:36:54.779419889 +0100 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python + """cssutils - CSS Cascading Style Sheets library for Python + + Copyright (C) 2004-2009 Christof Hoeke +diff -Naupr cssutils-0.9.6.orig/src/cssutils/parse.py cssutils-0.9.6/src/cssutils/parse.py +--- cssutils-0.9.6.orig/src/cssutils/parse.py 2009-05-30 16:50:14.000000000 +0200 ++++ cssutils-0.9.6/src/cssutils/parse.py 2010-02-25 13:38:57.146418749 +0100 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python + """A validating CSSParser""" + __all__ = ['CSSParser'] + __docformat__ = 'restructuredtext' +diff -Naupr cssutils-0.9.6.orig/src/cssutils/scripts/csscapture.py cssutils-0.9.6/src/cssutils/scripts/csscapture.py +--- cssutils-0.9.6.orig/src/cssutils/scripts/csscapture.py 2008-12-24 14:07:56.000000000 +0100 ++++ cssutils-0.9.6/src/cssutils/scripts/csscapture.py 2010-02-25 13:38:43.975419347 +0100 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python + """Retrieve all CSS stylesheets including embedded for a given URL. + Retrieve as StyleSheetList or save to disk - raw, parsed or minified version. + +diff -Naupr cssutils-0.9.6.orig/src/cssutils/scripts/csscombine.py cssutils-0.9.6/src/cssutils/scripts/csscombine.py +--- cssutils-0.9.6.orig/src/cssutils/scripts/csscombine.py 2008-12-24 16:20:32.000000000 +0100 ++++ cssutils-0.9.6/src/cssutils/scripts/csscombine.py 2010-02-25 13:38:01.651419997 +0100 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python + """Combine sheets referred to by @import rules in a given CSS proxy sheet + into a single new sheet. + +@@ -96,4 +95,4 @@ def main(args=None): + + + if __name__ == '__main__': +- sys.exit(main()) +\ No newline at end of file ++ sys.exit(main()) +diff -Naupr cssutils-0.9.6.orig/src/cssutils/scripts/cssparse.py cssutils-0.9.6/src/cssutils/scripts/cssparse.py +--- cssutils-0.9.6.orig/src/cssutils/scripts/cssparse.py 2008-12-24 14:07:56.000000000 +0100 ++++ cssutils-0.9.6/src/cssutils/scripts/cssparse.py 2010-02-25 13:39:02.410419486 +0100 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python + """utility script to parse given filenames or string + """ + __docformat__ = 'restructuredtext' +diff -Naupr cssutils-0.9.6.orig/src/cssutils/serialize.py cssutils-0.9.6/src/cssutils/serialize.py +--- cssutils-0.9.6.orig/src/cssutils/serialize.py 2009-08-02 13:47:46.000000000 +0200 ++++ cssutils-0.9.6/src/cssutils/serialize.py 2010-02-25 13:38:08.020418542 +0100 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python + # -*- coding: utf-8 -*- + """cssutils serializer""" + __all__ = ['CSSSerializer', 'Preferences'] +@@ -948,4 +947,4 @@ class CSSSerializer(object): + out.append(val, None, space=False) + + return out.value() +- +\ No newline at end of file ++ +diff -Naupr cssutils-0.9.6.orig/src/cssutils/tokenize2.py cssutils-0.9.6/src/cssutils/tokenize2.py +--- cssutils-0.9.6.orig/src/cssutils/tokenize2.py 2009-08-02 18:36:10.000000000 +0200 ++++ cssutils-0.9.6/src/cssutils/tokenize2.py 2010-02-25 13:36:46.426420150 +0100 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python + # -*- coding: utf-8 -*- + """New CSS Tokenizer (a generator) + """ diff --git a/python-cssutils.spec b/python-cssutils.spec index 5fbd144..d2ce965 100644 --- a/python-cssutils.spec +++ b/python-cssutils.spec @@ -2,18 +2,19 @@ Summary: CSS Cascading Style Sheets library for Python Name: python-cssutils -Version: 0.9.5.1 -Release: 6%{?dist} +Version: 0.9.6 +Release: 1%{?dist} License: LGPLv3+ Group: Development/Libraries URL: http://cthedot.de/cssutils/ Source: http://cssutils.googlecode.com/files/cssutils-%{version}.zip -Patch0: cssutils-0.9.5.1-nohashbang.patch +Patch0: cssutils-0.9.6-nohashbang.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root # Required at runtime for the css* executables Requires: python-setuptools BuildRequires: python-devel BuildRequires: python-setuptools +BuildRequires: dos2unix BuildArch: noarch %description @@ -34,13 +35,7 @@ build CSS Cascading Style Sheets. %setup -q -n cssutils-%{version} %patch0 -p1 # Convert all CRLF files, keeping original timestamps -for FILE in `find . -type f -exec grep -Pl '\r\n' {} \;`; do - tr -d '\r' < ${FILE} > ${FILE}.tmp - touch -r ${FILE} ${FILE}.timestamp - cat ${FILE}.tmp > ${FILE} - touch -r ${FILE}.timestamp ${FILE} - rm -f ${FILE}.timestamp ${FILE}.tmp -done +find . -type f -exec dos2unix -k {} \; %build @@ -60,8 +55,9 @@ done %files # The sources have some 2755 mode directories (as of 0.9.5.1), fix here -%defattr(-,root,root,0755) -%doc CHANGELOG.txt COPYING* docs/ README.txt +#defattr(-,root,root,0755) +%defattr(-,root,root,-) +%doc CHANGELOG.txt COPYING* README.txt %{_bindir}/csscapture %{_bindir}/csscombine %{_bindir}/cssparse @@ -73,9 +69,13 @@ done %files doc %defattr(-,root,root,-) -%doc doc/* +%doc docs/* examples/ + %changelog +* Thu Feb 25 2010 Matthias Saou 0.9.6-1 +- Update to 0.9.6. + * Sun Jul 26 2009 Fedora Release Engineering - 0.9.5.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index 55194c6..16e5061 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b5ee33892918c6589017cfb318db8190 cssutils-0.9.5.1.zip +93573ed91ae43c7c8620886111d65a2a cssutils-0.9.6.zip