pool/bluefish
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 900017 from home:StevenK:branches:Education

Browse Source 
- Refresh remove-python-class-shebang.patch to remove a requirement of
  /usr/bin/python
- Switch BuildRequires for pkgconfig(python3) to link against it instead

OBS-URL: https://build.opensuse.org/request/show/900017
OBS-URL: https://build.opensuse.org/package/show/Education/bluefish?expand=0&rev=36
This commit is contained in:
Lars Vogdt 2021-06-15 20:33:21 +00:00 committed by Git OBS Bridge
parent 429422894c
commit 24e5fbe1de
3 changed files with 92 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bluefish.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Jun 15 05:13:38 UTC 2021 - Steve Kowalik <steven.kowalik@suse.com>
- Refresh remove-python-class-shebang.patch to remove a requirement of
/usr/bin/python
- Switch BuildRequires for pkgconfig(python3) to link against it instead
-------------------------------------------------------------------
Tue Feb 23 23:05:39 UTC 2021 - Dirk Müller <dmueller@suse.com>

2
bluefish.spec
View File

@ -50,7 +50,7 @@ BuildRequires: pkgconfig(libpcre)
BuildRequires: pkgconfig(libwnck-3.0)
BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(pango)
BuildRequires: pkgconfig(python)
BuildRequires: pkgconfig(python3)
Requires: sgml-skel
Recommends: libxml2-tools
Recommends: make

151
remove-python-class-shebang.patch
View File

@ -1,16 +1,16 @@
Index: bluefish-2.2.11/src/plugin_zencoding/zencoding/actions/basic.py
Index: bluefish-2.2.12/src/plugin_zencoding/zencoding/actions/basic.py
===================================================================
--- bluefish-2.2.11.orig/src/plugin_zencoding/zencoding/actions/basic.py
+++ bluefish-2.2.11/src/plugin_zencoding/zencoding/actions/basic.py
--- bluefish-2.2.12.orig/src/plugin_zencoding/zencoding/actions/basic.py
+++ bluefish-2.2.12/src/plugin_zencoding/zencoding/actions/basic.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
# -*- coding: utf-8 -*-
"""
Index: bluefish-2.2.11/src/plugin_zencoding/zencoding/actions/__init__.py
Index: bluefish-2.2.12/src/plugin_zencoding/zencoding/actions/__init__.py
===================================================================
--- bluefish-2.2.11.orig/src/plugin_zencoding/zencoding/actions/__init__.py
+++ bluefish-2.2.11/src/plugin_zencoding/zencoding/actions/__init__.py
--- bluefish-2.2.12.orig/src/plugin_zencoding/zencoding/actions/__init__.py
+++ bluefish-2.2.12/src/plugin_zencoding/zencoding/actions/__init__.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
# -*- coding: utf-8 -*-
@ -23,19 +23,19 @@ Index: bluefish-2.2.11/src/plugin_zencoding/zencoding/actions/__init__.py
-del __sub_modules
\ No newline at end of file
+del __sub_modules
Index: bluefish-2.2.11/src/plugin_zencoding/zencoding/actions/token.py
Index: bluefish-2.2.12/src/plugin_zencoding/zencoding/actions/token.py
===================================================================
--- bluefish-2.2.11.orig/src/plugin_zencoding/zencoding/actions/token.py
+++ bluefish-2.2.11/src/plugin_zencoding/zencoding/actions/token.py
--- bluefish-2.2.12.orig/src/plugin_zencoding/zencoding/actions/token.py
+++ bluefish-2.2.12/src/plugin_zencoding/zencoding/actions/token.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
# -*- coding: utf-8 -*-
'''
Index: bluefish-2.2.11/src/plugin_zencoding/zencoding/filters/comment.py
Index: bluefish-2.2.12/src/plugin_zencoding/zencoding/filters/comment.py
===================================================================
--- bluefish-2.2.11.orig/src/plugin_zencoding/zencoding/filters/comment.py
+++ bluefish-2.2.11/src/plugin_zencoding/zencoding/filters/comment.py
--- bluefish-2.2.12.orig/src/plugin_zencoding/zencoding/filters/comment.py
+++ bluefish-2.2.12/src/plugin_zencoding/zencoding/filters/comment.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
# -*- coding: utf-8 -*-
@ -48,10 +48,10 @@ Index: bluefish-2.2.11/src/plugin_zencoding/zencoding/filters/comment.py
- return tree
\ No newline at end of file
+ return tree
Index: bluefish-2.2.11/src/plugin_zencoding/zencoding/filters/css.py
Index: bluefish-2.2.12/src/plugin_zencoding/zencoding/filters/css.py
===================================================================
--- bluefish-2.2.11.orig/src/plugin_zencoding/zencoding/filters/css.py
+++ bluefish-2.2.11/src/plugin_zencoding/zencoding/filters/css.py
--- bluefish-2.2.12.orig/src/plugin_zencoding/zencoding/filters/css.py
+++ bluefish-2.2.12/src/plugin_zencoding/zencoding/filters/css.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
# -*- coding: utf-8 -*-
@ -64,10 +64,10 @@ Index: bluefish-2.2.11/src/plugin_zencoding/zencoding/filters/css.py
- return tree
\ No newline at end of file
+ return tree
Index: bluefish-2.2.11/src/plugin_zencoding/zencoding/filters/escape.py
Index: bluefish-2.2.12/src/plugin_zencoding/zencoding/filters/escape.py
===================================================================
--- bluefish-2.2.11.orig/src/plugin_zencoding/zencoding/filters/escape.py
+++ bluefish-2.2.11/src/plugin_zencoding/zencoding/filters/escape.py
--- bluefish-2.2.12.orig/src/plugin_zencoding/zencoding/filters/escape.py
+++ bluefish-2.2.12/src/plugin_zencoding/zencoding/filters/escape.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
# -*- coding: utf-8 -*-
@ -80,10 +80,10 @@ Index: bluefish-2.2.11/src/plugin_zencoding/zencoding/filters/escape.py
- return tree
\ No newline at end of file
+ return tree
Index: bluefish-2.2.11/src/plugin_zencoding/zencoding/filters/format-css.py
Index: bluefish-2.2.12/src/plugin_zencoding/zencoding/filters/format-css.py
===================================================================
--- bluefish-2.2.11.orig/src/plugin_zencoding/zencoding/filters/format-css.py
+++ bluefish-2.2.11/src/plugin_zencoding/zencoding/filters/format-css.py
--- bluefish-2.2.12.orig/src/plugin_zencoding/zencoding/filters/format-css.py
+++ bluefish-2.2.12/src/plugin_zencoding/zencoding/filters/format-css.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
# -*- coding: utf-8 -*-
@ -96,10 +96,10 @@ Index: bluefish-2.2.11/src/plugin_zencoding/zencoding/filters/format-css.py
- return tree
\ No newline at end of file
+ return tree
Index: bluefish-2.2.11/src/plugin_zencoding/zencoding/filters/format.py
Index: bluefish-2.2.12/src/plugin_zencoding/zencoding/filters/format.py
===================================================================
--- bluefish-2.2.11.orig/src/plugin_zencoding/zencoding/filters/format.py
+++ bluefish-2.2.11/src/plugin_zencoding/zencoding/filters/format.py
--- bluefish-2.2.12.orig/src/plugin_zencoding/zencoding/filters/format.py
+++ bluefish-2.2.12/src/plugin_zencoding/zencoding/filters/format.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
# -*- coding: utf-8 -*-
@ -112,10 +112,10 @@ Index: bluefish-2.2.11/src/plugin_zencoding/zencoding/filters/format.py
- return tree
\ No newline at end of file
+ return tree
Index: bluefish-2.2.11/src/plugin_zencoding/zencoding/filters/haml.py
Index: bluefish-2.2.12/src/plugin_zencoding/zencoding/filters/haml.py
===================================================================
--- bluefish-2.2.11.orig/src/plugin_zencoding/zencoding/filters/haml.py
+++ bluefish-2.2.11/src/plugin_zencoding/zencoding/filters/haml.py
--- bluefish-2.2.12.orig/src/plugin_zencoding/zencoding/filters/haml.py
+++ bluefish-2.2.12/src/plugin_zencoding/zencoding/filters/haml.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
# -*- coding: utf-8 -*-
@ -128,19 +128,19 @@ Index: bluefish-2.2.11/src/plugin_zencoding/zencoding/filters/haml.py
- return tree
\ No newline at end of file
+ return tree
Index: bluefish-2.2.11/src/plugin_zencoding/zencoding/filters/html.py
Index: bluefish-2.2.12/src/plugin_zencoding/zencoding/filters/html.py
===================================================================
--- bluefish-2.2.11.orig/src/plugin_zencoding/zencoding/filters/html.py
+++ bluefish-2.2.11/src/plugin_zencoding/zencoding/filters/html.py
--- bluefish-2.2.12.orig/src/plugin_zencoding/zencoding/filters/html.py
+++ bluefish-2.2.12/src/plugin_zencoding/zencoding/filters/html.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
# -*- coding: utf-8 -*-
'''
Index: bluefish-2.2.11/src/plugin_zencoding/zencoding/filters/__init__.py
Index: bluefish-2.2.12/src/plugin_zencoding/zencoding/filters/__init__.py
===================================================================
--- bluefish-2.2.11.orig/src/plugin_zencoding/zencoding/filters/__init__.py
+++ bluefish-2.2.11/src/plugin_zencoding/zencoding/filters/__init__.py
--- bluefish-2.2.12.orig/src/plugin_zencoding/zencoding/filters/__init__.py
+++ bluefish-2.2.12/src/plugin_zencoding/zencoding/filters/__init__.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
# -*- coding: utf-8 -*-
@ -153,10 +153,10 @@ Index: bluefish-2.2.11/src/plugin_zencoding/zencoding/filters/__init__.py
-del __sub_modules
\ No newline at end of file
+del __sub_modules
Index: bluefish-2.2.11/src/plugin_zencoding/zencoding/filters/single-line.py
Index: bluefish-2.2.12/src/plugin_zencoding/zencoding/filters/single-line.py
===================================================================
--- bluefish-2.2.11.orig/src/plugin_zencoding/zencoding/filters/single-line.py
+++ bluefish-2.2.11/src/plugin_zencoding/zencoding/filters/single-line.py
--- bluefish-2.2.12.orig/src/plugin_zencoding/zencoding/filters/single-line.py
+++ bluefish-2.2.12/src/plugin_zencoding/zencoding/filters/single-line.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
# -*- coding: utf-8 -*-
@ -169,10 +169,10 @@ Index: bluefish-2.2.11/src/plugin_zencoding/zencoding/filters/single-line.py
- return tree
\ No newline at end of file
+ return tree
Index: bluefish-2.2.11/src/plugin_zencoding/zencoding/filters/trim.py
Index: bluefish-2.2.12/src/plugin_zencoding/zencoding/filters/trim.py
===================================================================
--- bluefish-2.2.11.orig/src/plugin_zencoding/zencoding/filters/trim.py
+++ bluefish-2.2.11/src/plugin_zencoding/zencoding/filters/trim.py
--- bluefish-2.2.12.orig/src/plugin_zencoding/zencoding/filters/trim.py
+++ bluefish-2.2.12/src/plugin_zencoding/zencoding/filters/trim.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
# -*- coding: utf-8 -*-
@ -185,10 +185,10 @@ Index: bluefish-2.2.11/src/plugin_zencoding/zencoding/filters/trim.py
- return tree
\ No newline at end of file
+ return tree
Index: bluefish-2.2.11/src/plugin_zencoding/zencoding/filters/xsl.py
Index: bluefish-2.2.12/src/plugin_zencoding/zencoding/filters/xsl.py
===================================================================
--- bluefish-2.2.11.orig/src/plugin_zencoding/zencoding/filters/xsl.py
+++ bluefish-2.2.11/src/plugin_zencoding/zencoding/filters/xsl.py
--- bluefish-2.2.12.orig/src/plugin_zencoding/zencoding/filters/xsl.py
+++ bluefish-2.2.12/src/plugin_zencoding/zencoding/filters/xsl.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
# -*- coding: utf-8 -*-
@ -201,10 +201,10 @@ Index: bluefish-2.2.11/src/plugin_zencoding/zencoding/filters/xsl.py
- process(item, profile)
\ No newline at end of file
+ process(item, profile)
Index: bluefish-2.2.11/src/plugin_zencoding/zencoding/html_matcher.py
Index: bluefish-2.2.12/src/plugin_zencoding/zencoding/html_matcher.py
===================================================================
--- bluefish-2.2.11.orig/src/plugin_zencoding/zencoding/html_matcher.py
+++ bluefish-2.2.11/src/plugin_zencoding/zencoding/html_matcher.py
--- bluefish-2.2.12.orig/src/plugin_zencoding/zencoding/html_matcher.py
+++ bluefish-2.2.12/src/plugin_zencoding/zencoding/html_matcher.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
# -*- coding: utf-8 -*-
@ -217,10 +217,10 @@ Index: bluefish-2.2.11/src/plugin_zencoding/zencoding/html_matcher.py
- return action(opening_tag, closing_tag, start_ix)
\ No newline at end of file
+ return action(opening_tag, closing_tag, start_ix)
Index: bluefish-2.2.11/src/plugin_zencoding/zencoding/resources.py
Index: bluefish-2.2.12/src/plugin_zencoding/zencoding/resources.py
===================================================================
--- bluefish-2.2.11.orig/src/plugin_zencoding/zencoding/resources.py
+++ bluefish-2.2.11/src/plugin_zencoding/zencoding/resources.py
--- bluefish-2.2.12.orig/src/plugin_zencoding/zencoding/resources.py
+++ bluefish-2.2.12/src/plugin_zencoding/zencoding/resources.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
# -*- coding: utf-8 -*-
@ -233,19 +233,19 @@ Index: bluefish-2.2.11/src/plugin_zencoding/zencoding/resources.py
- set_vocabulary(user_settings, VOC_USER)
\ No newline at end of file
+ set_vocabulary(user_settings, VOC_USER)
Index: bluefish-2.2.11/src/plugin_zencoding/zencoding/utils.py
Index: bluefish-2.2.12/src/plugin_zencoding/zencoding/utils.py
===================================================================
--- bluefish-2.2.11.orig/src/plugin_zencoding/zencoding/utils.py
+++ bluefish-2.2.11/src/plugin_zencoding/zencoding/utils.py
--- bluefish-2.2.12.orig/src/plugin_zencoding/zencoding/utils.py
+++ bluefish-2.2.12/src/plugin_zencoding/zencoding/utils.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
# -*- coding: utf-8 -*-
'''
Core Zen Coding library. Contains various text manipulation functions:
Index: bluefish-2.2.11/src/plugin_zencoding/zencoding/zen_settings.py
Index: bluefish-2.2.12/src/plugin_zencoding/zencoding/zen_settings.py
===================================================================
--- bluefish-2.2.11.orig/src/plugin_zencoding/zencoding/zen_settings.py
+++ bluefish-2.2.11/src/plugin_zencoding/zencoding/zen_settings.py
--- bluefish-2.2.12.orig/src/plugin_zencoding/zencoding/zen_settings.py
+++ bluefish-2.2.12/src/plugin_zencoding/zencoding/zen_settings.py
@@ -737,4 +737,4 @@ zen_settings = {
'filters': 'haml',
'extends': 'html'
@ -253,20 +253,20 @@ Index: bluefish-2.2.11/src/plugin_zencoding/zencoding/zen_settings.py
-}
\ No newline at end of file
+}
Index: bluefish-2.2.11/data/cssmin.py
Index: bluefish-2.2.12/data/cssmin.py
===================================================================
--- bluefish-2.2.11.orig/data/cssmin.py
+++ bluefish-2.2.11/data/cssmin.py
--- bluefish-2.2.12.orig/data/cssmin.py
+++ bluefish-2.2.12/data/cssmin.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
# -*- coding: utf-8 -*-
"""`cssmin` - A Python port of the YUI CSS compressor."""
Index: bluefish-2.2.11/data/jsbeautify
Index: bluefish-2.2.12/data/jsbeautify
===================================================================
--- bluefish-2.2.11.orig/data/jsbeautify
+++ bluefish-2.2.11/data/jsbeautify
--- bluefish-2.2.12.orig/data/jsbeautify
+++ bluefish-2.2.12/data/jsbeautify
@@ -1,7 +1,7 @@
-#! /usr/bin/env python
+#!/usr/bin/python3
@ -278,23 +278,40 @@ Index: bluefish-2.2.11/data/jsbeautify
-sys.exit(main())
\ No newline at end of file
+sys.exit(main())
Index: bluefish-2.2.11/data/jsmin.py
Index: bluefish-2.2.12/data/jsmin.py
===================================================================
--- bluefish-2.2.11.orig/data/jsmin.py
+++ bluefish-2.2.11/data/jsmin.py
--- bluefish-2.2.12.orig/data/jsmin.py
+++ bluefish-2.2.12/data/jsmin.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
# This code is original from jsmin by Douglas Crockford, it was translated to
# Python by Baruch Even. It was rewritten by Dave St.Germain for speed.
Index: bluefish-2.2.11/data/lorem-ipsum-generator
Index: bluefish-2.2.12/data/lorem-ipsum-generator
===================================================================
--- bluefish-2.2.11.orig/data/lorem-ipsum-generator
+++ bluefish-2.2.11/data/lorem-ipsum-generator
@@ -1,4 +1,4 @@
--- bluefish-2.2.12.orig/data/lorem-ipsum-generator
+++ bluefish-2.2.12/data/lorem-ipsum-generator
@@ -1,11 +1,9 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
import sys
from os.path import abspath, exists
from optparse import OptionParser
-#!/usr/bin/python
-
# stripped down by Senthil Palanisami (Sen) [spenthil@gmail.com] to
# work on Google App Engine and exist as a single file
# use as described in http://code.google.com/p/lorem-ipsum-generator/wiki/ApiOverview
Index: bluefish-2.2.12/data/css_decompressor
===================================================================
--- bluefish-2.2.12.orig/data/css_decompressor
+++ bluefish-2.2.12/data/css_decompressor
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
# -*- coding: utf-8 -*-
#