- updated to 2.2.2

- created subpackage for plugins and packeged plugins locales (from TODO)
- python plugin is no longer experimental and enabled by default

Changed files:
    bluefish-locales.patch -> 1.11
    bluefish.spec -> 1.102

diff --git a/bluefish-locales.patch b/bluefish-locales.patch
index 1c63a78852e560f15383c09591319a49a9646294..80e414c58245450c290b9a74cf82b908691225ce 100644 (file)
--- a/bluefish-locales.patch
+++ b/bluefish-locales.patch
@@ -4,8 +4,8 @@
  dnl   I18N options
  dnl ************************
  
--m4_define([_BF_LINGUAS], [bg cs da de el es eu 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], [bg cs da de el es eu fi fr gl hu it ja ko nb nl nn pl pt pt_BR ro ru sk sr@Latn sv ta tr uk zh_CN zh_TW])
+-m4_define([_BF_LINGUAS], [bg ca cs da de el es eu 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], [bg ca cs da de el es eu fi fr gl hu it ja ko nb nl nn pl pt pt_BR ro ru sk sr@Latn 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

diff --git a/bluefish.spec b/bluefish.spec
index 53af8caed7e31632d15cc1212886f1c610a0d349..e34eaa0b27c82efbc3c55cbc1409713ca286e8c4 100644 (file)
--- a/bluefish.spec
+++ b/bluefish.spec
@@ -1,21 +1,14 @@
 #
-# TODO: 
-#      - separate subpackages for plugins
-#      - package locales for plugins
-#
-# Conditional build:
-%bcond_with    python  # enable python integration (HIGHLY EXPERIMENTAL)
-#
 Summary:       Bluefish - HTML editor for the experienced web designer
 Summary(pl.UTF-8):     Bluefish - Edytor HTML-a dla zaawansowanych
 Name:          bluefish
-Version:       2.2.0
+Version:       2.2.2
 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: 23d894e065585d35dbc74c246c15cc9d
+# Source0-md5: 6475325565fb0a003a75f88564b7835f
 # but if you want ftp: try this one
 # Source0:     ftp://bluefish.advancecreations.com/bluefish/downloads/%{name}-%{version}.tar.bz2
 Patch0:                %{name}-locales.patch
@@ -25,7 +18,7 @@ BuildRequires:        automake >= 1.8
 BuildRequires: enchant-devel >= 1.4
 BuildRequires: gettext-devel
 BuildRequires: glib2-devel >= 2.16
-BuildRequires: gtk+2-devel >= 2.14
+BuildRequires: gtk+3-devel >= 3.2.2
 BuildRequires: gucharmap-devel >= 2.20
 BuildRequires: intltool
 BuildRequires: libpng >= 1.2.5
@@ -33,6 +26,7 @@ BuildRequires:        libtool
 BuildRequires: libxml2-progs
 BuildRequires: man
 BuildRequires: pkgconfig
+BuildRequires: python-devel >= 2.4
 BuildRequires: rpmbuild(macros) >= 1.311
 Requires(post,postun): desktop-file-utils
 Requires(post,postun): gtk-update-icon-cache
@@ -57,6 +51,18 @@ 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
+Summary:       Bluefish plugins
+Summary(pl.UTF-8):     Wtyczki Bluefish
+Group:         X11/Libraries
+Requires:      %{name} = %{version}-%{release}
+
+%description -n %{name}-plugins
+Bluefish plugins.
+
+%description -n %{name}-plugins -l pl.UTF-8
+Wtyczki Bluefish.
+
 %prep
 %setup -q
 %patch0 -p1
@@ -78,8 +84,7 @@ done
 %{__aclocal}
 %{__autoconf}
 %configure \
-       --disable-update-databases \
-       %{?with_python:--enable-python}
+       --disable-update-databases
 
 %{__make}
 
@@ -94,7 +99,15 @@ mv data/bflang/sample.bflang2 doc/bflang/
 %{__rm} -r $RPM_BUILD_ROOT%{_docdir}/bluefish/
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/bluefish/*.la
 
-%find_lang %{name} --all-name
+%find_lang %{name}
+# lang files for plugins
+%find_lang %{name}_plugin_about -a %{name}_plugins.lang
+%find_lang %{name}_plugin_charmap -a %{name}_plugins.lang
+%find_lang %{name}_plugin_entities -a %{name}_plugins.lang
+%find_lang %{name}_plugin_htmlbar -a %{name}_plugins.lang
+%find_lang %{name}_plugin_infbrowser -a %{name}_plugins.lang
+%find_lang %{name}_plugin_snippets -a %{name}_plugins.lang
+%find_lang %{name}_plugin_zencoding -a %{name}_plugins.lang
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -114,14 +127,14 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS README TODO doc/
 %attr(755,root,root) %{_bindir}/bluefish
 %dir %{_datadir}/%{name}
-%{_datadir}/mime/packages/bluefish.xml
-%{_datadir}/xml/bluefish
 %{_datadir}/bluefish/bflang
 %{_datadir}/bluefish/bflib
 %{_datadir}/bluefish/bluefish_splash.png
-%{_datadir}/bluefish/encodings
-%{_datadir}/bluefish/snippets
+%{_datadir}/bluefish/default_accelmap
+%{_datadir}/bluefish/templates
 %{_datadir}/bluefish/ui
+%{_datadir}/mime/packages/bluefish.xml
+%{_datadir}/xml/bluefish
 %{_mandir}/man1/bluefish.1*
 %{_iconsdir}/hicolor/128x128/apps/bluefish.png
 %{_iconsdir}/hicolor/128x128/mimetypes/application-x-bluefish-project.png
@@ -149,4 +162,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_pixmapsdir}/application-x-bluefish-project.png
 %{_pixmapsdir}/bluefish.png
 %dir %{_libdir}/bluefish
+
+%files -n %{name}-plugins -f %{name}_plugins.lang
+%defattr(644,root,root,755)
+%{_datadir}/bluefish/encodings
+%{_datadir}/bluefish/plugins
+%{_datadir}/bluefish/snippets
 %attr(755,root,root) %{_libdir}/bluefish/*.so