packages: bluefish/bluefish.spec, bluefish/bluefish-locales.patch - updated...

[kiesiu]

Author: kiesiu                       Date: Mon Mar  5 15:57:58 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 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

---- Files affected:
packages/bluefish:
   bluefish.spec (1.101 -> 1.102) , bluefish-locales.patch (1.10 -> 1.11) 

---- Diffs:

================================================================
Index: packages/bluefish/bluefish.spec
diff -u packages/bluefish/bluefish.spec:1.101 packages/bluefish/bluefish.spec:1.102
--- packages/bluefish/bluefish.spec:1.101	Thu Dec 22 13:19:26 2011
+++ packages/bluefish/bluefish.spec	Mon Mar  5 16:57:52 2012
@@ -1,22 +1,15 @@
 # $Revision$, $Date$
 #
-# 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
@@ -26,7 +19,7 @@
 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
@@ -34,6 +27,7 @@
 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
@@ -58,6 +52,18 @@
 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
@@ -79,8 +85,7 @@
 %{__aclocal}
 %{__autoconf}
 %configure \
-	--disable-update-databases \
-	%{?with_python:--enable-python}
+	--disable-update-databases
 
 %{__make}
 
@@ -95,7 +100,15 @@
 %{__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
@@ -115,14 +128,14 @@
 %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
@@ -150,6 +163,12 @@
 %{_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
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -158,6 +177,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.102  2012/03/05 15:57:52  kiesiu
+- 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
+
 Revision 1.101  2011/12/22 12:19:26  lisu
 - it's now usable, rel 1
 

================================================================
Index: packages/bluefish/bluefish-locales.patch
diff -u packages/bluefish/bluefish-locales.patch:1.10 packages/bluefish/bluefish-locales.patch:1.11
--- packages/bluefish/bluefish-locales.patch:1.10	Thu Dec 22 13:05:07 2011
+++ packages/bluefish/bluefish-locales.patch	Mon Mar  5 16:57:52 2012
@@ -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 at 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 at 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
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/bluefish/bluefish.spec?r1=1.101&r2=1.102&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/bluefish/bluefish-locales.patch?r1=1.10&r2=1.11&f=u