[packages/bluefish] - updated to 2.2.16

Sun Mar 23 14:48:58 CET 2025

commit 3e89c9351506ca8c1252374d5f007fc0f2af0a72
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Mar 23 14:06:38 2025 +0100

    - updated to 2.2.16

 bluefish-locales.patch | 11 -------
 bluefish.spec          | 87 +++++++++++++++++++++++++-------------------------
 2 files changed, 43 insertions(+), 55 deletions(-)
---

diff --git a/bluefish.spec b/bluefish.spec
index 52767d2..fce5e2a 100644
--- a/bluefish.spec
+++ b/bluefish.spec
@@ -1,39 +1,35 @@
 Summary:	Bluefish - HTML editor for the experienced web designer
 Summary(pl.UTF-8):	Bluefish - Edytor HTML-a dla zaawansowanych
 Name:		bluefish
-Version:	2.2.14
-Release:	3
+Version:	2.2.16
+Release:	1
 License:	GPL v3+
 Group:		X11/Applications/Editors
 # The master server is here
-Source0:	http://www.bennewitz.com/bluefish/stable/source/%{name}-%{version}.tar.bz2
-# Source0-md5:	c99b6b1ba3e3e70b032936182bb0b387
-# but if you want ftp: try this one
-# Source0:	ftp://bluefish.advancecreations.com/bluefish/downloads/%{name}-%{version}.tar.bz2
-Patch0:		%{name}-locales.patch
-URL:		http://bluefish.openoffice.nl/
+Source0:	https://www.bennewitz.com/bluefish/stable/source/%{name}-%{version}.tar.bz2
+# Source0-md5:	6982e68b978777b7eac16c97bd7af834
+URL:		https://bluefish.openoffice.nl/index.html
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake >= 1.8
-BuildRequires:	enchant-devel >= 1.4
-BuildRequires:	gettext-tools
-BuildRequires:	glib2-devel >= 2.16
+BuildRequires:	enchant2-devel >= 1.4
+BuildRequires:	gdk-pixbuf2-devel >= 2.0
+BuildRequires:	gettext-tools >= 0.20
+BuildRequires:	glib2-devel >= 1:2.24
 BuildRequires:	gtk+3-devel >= 3.2.2
-BuildRequires:	gucharmap-devel >= 2.20
-BuildRequires:	intltool
-BuildRequires:	libpng >= 1.2.5
-BuildRequires:	libtool
+BuildRequires:	gucharmap-devel >= 3.0
+BuildRequires:	libtool >= 1.4
+BuildRequires:	libxml2-devel >= 2.0
 BuildRequires:	libxml2-progs
 #BuildRequires:	man
+BuildRequires:	pango-devel
 BuildRequires:	pkgconfig
-BuildRequires:	python3-devel
+BuildRequires:	python3-devel >= 1:3.3
 BuildRequires:	rpmbuild(macros) >= 1.311
 Requires(post,postun):	desktop-file-utils
 Requires(post,postun):	gtk-update-icon-cache
-Requires(post,postun):	hicolor-icon-theme
 Requires(post,postun):	shared-mime-info
-Requires:	gnome-vfs2 >= 2.2
-# sr at Latn vs. sr at latin
-Conflicts:	glibc-misc < 6:2.7
+Requires:	glib2 >= 1:2.24
+Requires:	hicolor-icon-theme
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -50,40 +46,35 @@ experientes. Atualmente ele está em estágio alfa, mas já está bastante
 usável. Algumas opções ainda não estão completamente finalizadas.
 Bluefish é liberado sob a licença GPL.
 
-%package -n %{name}-plugins
+%package plugins
 Summary:	Bluefish plugins
 Summary(pl.UTF-8):	Wtyczki Bluefish
 Group:		X11/Libraries
 Requires:	%{name} = %{version}-%{release}
 
-%description -n %{name}-plugins
+%description plugins
 Bluefish plugins.
 
-%description -n %{name}-plugins -l pl.UTF-8
+%description plugins -l pl.UTF-8
 Wtyczki Bluefish.
 
 %prep
 %setup -q
-%patch -P 0 -p1
 
-%{__mv} po/sr{, at Latn}.po
-%{__mv} src/plugin_about/po/sr{, at Latn}.po
-%{__mv} src/plugin_charmap/po/sr{, at Latn}.po
-%{__mv} src/plugin_entities/po/sr{, at Latn}.po
-%{__mv} src/plugin_htmlbar/po/sr{, at Latn}.po
-%{__mv} src/plugin_infbrowser/po/sr{, at Latn}.po
-%{__mv} src/plugin_snippets/po/sr{, at Latn}.po
+# disable enchant 1.x dependency, fallthrough to enchant-2 check
+%{__sed} -i -e 's/\[enchant\]/[enchant-disabled]/' configure.ac
 
-for plugin in `ls -d src/plugin_*`; do
-	cp %{_datadir}/gettext/po/Makefile.in.in $plugin/po
-done
+%{__sed} -i -e '1s,/usr/bin/python$,%{__python3},' \
+	data/css_decompressor \
+	data/json_prettyprint.py
 
-%{__sed} -E -i -e '1s,#!\s*/usr/bin/env\s+python(\s|$),#!%{__python3}\1,' -e '1s,#!\s*/usr/bin/python(\s|$),#!%{__python3}\1,' \
-      data/css_decompressor \
+%{__sed} -i -e '1s,/usr/bin/env python$,%{__python3},' \
       data/cssmin.py \
-      data/jsbeautify \
       data/jsmin.py \
-      data/lorem-ipsum-generator \
+      data/lorem-ipsum-generator
+
+# not executable actually
+%{__sed} -i -e '/^#!\/usr\/bin\/env python/d' \
       src/plugin_zencoding/zencoding/actions/__init__.py \
       src/plugin_zencoding/zencoding/actions/basic.py \
       src/plugin_zencoding/zencoding/actions/token.py \
@@ -102,10 +93,16 @@ done
       src/plugin_zencoding/zencoding/resources.py \
       src/plugin_zencoding/zencoding/utils.py
 
+for plugin in `ls -d src/plugin_*`; do
+	cp %{_datadir}/gettext/po/Makefile.in.in $plugin/po
+done
+
 %build
+%{__gettextize}
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
+%{__autoheader}
 %{__automake}
 %configure \
 	--disable-update-databases
@@ -118,11 +115,14 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install -d doc/bflang/
-mv data/bflang/sample.bflang2 doc/bflang/
-%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/bluefish/
+install -d doc/bflang
+%{__mv} data/bflang/sample.bflang2 doc/bflang
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/bluefish
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/bluefish/*.la
 
+# actually it's latin variant
+%{__mv} $RPM_BUILD_ROOT%{_localedir}/{sr,sr at latin}
+
 %find_lang %{name}
 # lang files for plugins
 %find_lang %{name}_plugin_about -a %{name}_plugins.lang
@@ -156,13 +156,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/bluefish/bluefish_splash.png
 %{_datadir}/bluefish/colorprofiles
 %{_datadir}/bluefish/default_accelmap
-%{_datadir}/bluefish/jsbeautifier
 %{_datadir}/bluefish/templates
 %{_datadir}/bluefish/ui
 %attr(755,root,root) %{_datadir}/bluefish/css_decompressor
 %attr(755,root,root) %{_datadir}/bluefish/cssmin.py
-%attr(755,root,root) %{_datadir}/bluefish/jsbeautify
 %attr(755,root,root) %{_datadir}/bluefish/jsmin.py
+%attr(755,root,root) %{_datadir}/bluefish/json_prettyprint.py
 %attr(755,root,root) %{_datadir}/bluefish/lorem-ipsum-generator
 %{_datadir}/mime/packages/bluefish.xml
 %{_metainfodir}/bluefish.appdata.xml
@@ -177,7 +176,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_pixmapsdir}/bluefish.png
 %dir %{_libdir}/bluefish
 
-%files -n %{name}-plugins -f %{name}_plugins.lang
+%files plugins -f %{name}_plugins.lang
 %defattr(644,root,root,755)
 %{_datadir}/bluefish/encodings
 %{_datadir}/bluefish/plugins
diff --git a/bluefish-locales.patch b/bluefish-locales.patch
deleted file mode 100644
index 5208bf2..0000000
--- a/bluefish-locales.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- bluefish-2.2.0/configure.ac~	2011-11-06 03:11:55.000000000 +0100
-+++ bluefish-2.2.0/configure.ac	2011-12-22 12:43:59.047287815 +0100
-@@ -34,7 +34,7 @@
- dnl ************************
- dnl   I18N options
- dnl ************************
--m4_define([_BF_LINGUAS], [ar bg ca cs da de el en es eu fa fi fr gl hu it ja ko nb nl nn pl pt pt_BR ro ru sk sr sv ta tr uk zh_CN zh_TW])
-+m4_define([_BF_LINGUAS], [ar bg ca cs da de el en es eu fa fi fr gl hu it ja ko nb nl nn pl pt pt_BR ro ru sk sr at Latin sv ta tr uk zh_CN zh_TW])
- #ALL_LINGUAS="bg cs da de el es eu fi fr gl hu it ja ko nb nl pl pt pt_BR ro ru sk sr sv ta tr uk zh_CN zh_TW"
- AC_SUBST([ALL_LINGUAS], "_BF_LINGUAS")
- GETTEXT_PACKAGE=AC_PACKAGE_NAME
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/bluefish.git/commitdiff/3e89c9351506ca8c1252374d5f007fc0f2af0a72

