src update. enable zen-coding

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@8216 ec354946-7b23-47d6-9f5a-488ba84defc7

b/bluefish/bluefish-vl.spec

@@ -1,103 +1,168 @@
-Name: bluefish
-Summary: The Bluefish HTML Editor
-Summary(ja): Bluefish HTML エディタ
-Version: 2.0.3
-Release: 1%{?_dist_release}
-
-License: GPLv2
-Group:   Applications/Editors
-Source:  http://www.bennewitz.com/bluefish/stable/source/%{name}-%{version}.tar.bz2
-
-URL: http://bluefish.openoffice.nl/
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: desktop-file-utils
-BuildRequires: enchant-devel 
-BuildRequires: glib2-devel >= 2.16.0 
-BuildRequires: gtk2-devel >= 2.12.0 
-%if %{?_dist_release} == "vl5" || %{?_dist_release} == "vl6"
-BuildRequires: gucharmap-devel
+Name:		bluefish
+Version:	2.2.4
+Release:	1%{?_dist_release}
+Summary:	GTK2 web development application for experienced users
+Summary(ja): 	経験者向け Web 開発用 GTK2 アプリケーション
+Group:		Applications/Editors
+License:	GPLv3+
+URL:		http://bluefish.openoffice.nl/
+# Upstream source contains non-free jsmin.py
+# Source0:	http://www.bennewitz.com/bluefish/stable/source/bluefish-%{version}%{?prerel:-%{prerel}}.tar.bz2
+# To generate clean source, simply rm -rf data/jsmin.py
+# We provide a replacement in Source1.
+Source0:	bluefish-%{version}%{?prerel:-%{prerel}}-clean.tar.bz2
+Source1:	https://raw.github.com/v8/v8/master/tools/jsmin.py
+BuildRoot:	%{_tmppath}/%{name}-%{version}-root
+BuildRequires:	desktop-file-utils
+BuildRequires:	enchant-devel >= 1.4.2
+BuildRequires:	gettext
+BuildRequires:	glib2-devel >= 2.24
+%if "%{?_dist_release}" < "vl7"
+BuildRequires:	gtk2-devel >= 2.20
+BuildRequires:	gucharmap-devel >= 2.20
+%else
+BuildRequires:	gtk3-devel >= 3.2
+BuildRequires:	gucharmap-devel >= 2.90
 %endif
-BuildRequires: libxml2-devel
-BuildRequires: pcre-devel >= 3.9
-BuildRequires: shared-mime-info
-Requires(post): desktop-file-utils shared-mime-info
-Requires: gtk2 >= 2.12.0 
-Requires: pcre >= 3.9
-
-Distribution: Vine Linux
-Vendor: Project Vine
+BuildRequires:	intltool
+BuildRequires:	libxml2-devel
+BuildRequires:	python-devel
+# Needed to check man pages
+BuildRequires:	/usr/bin/man
+# For the Advanced Open function
+Requires:	findutils, grep
+Requires:	%{name}-shared-data = %{version}-%{release}
+
+# Automatically upgrade bluefish-unstable
+Obsoletes:	bluefish-unstable < %{version}-%{release}
+Provides:	bluefish-unstable = %{version}-%{release}
+
+# XML Catalog registration
+Requires(post): /usr/bin/xmlcatalog, xml-common
+Requires(postun): /usr/bin/xmlcatalog, xml-common
+
+# Don't "provide" plugin shared objects
+%{?filter_setup:
+%filter_provides_in %{_libdir}/%{name}/.*\.so$
+%filter_setup
+}
+
+# Move to unversioned documentation directories from F-20
+# https://fedoraproject.org/wiki/Changes/UnversionedDocdirs
+%global bluefish_docdir %{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}
 
 %description
-Bluefish is a GTK+ HTML editor for the experienced web designer or
-programmer. It is not finished yet, but already a very powerful site
-creating environment. Bluefish has extended support for programming
-dynamic and interactive websites, there is for example a lot of PHP
-support.
-
-%description -l ja
-Bluefish は経験に富んだウェブデザイナやプログラマ向けの HTML エディタです。
-また完成していないが、すでに非常に強力にサイトを作成する環境になっている。
-Bluefish は動的な対話型ウェブサイトをプログラミングのために、
-拡張サポートしている。例えば、数多くの PHP をサポートしている。
+Bluefish is a powerful editor for experienced web designers and programmers.
+Bluefish supports many programming and markup languages, but it focuses on
+editing dynamic and interactive websites.
+
+%package shared-data
+Summary:	Architecture-independent data for %{name}
+Group:		Development/Tools
+BuildArch:	noarch
+# For ownership of %%{_datadir}/mime/packages
+Requires:	shared-mime-info
+# For ownership of %%{_datadir}/icons/hicolor/*/{apps,mimetypes}
+Requires:	hicolor-icon-theme
+
+# Automatically upgrade bluefish-unstable-shared-data
+Obsoletes:	bluefish-unstable-shared-data < %{version}-%{release}
+Provides:	bluefish-unstable-shared-data = %{version}-%{release}
+
+%description shared-data
+Files common to every architecture version of %{name}.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q -n %{name}-%{version}%{?prerel:-%{prerel}}
+
+cp -a %{SOURCE1} data/
+sed -i 's|python2.4|python|g' data/jsmin.py
 
 %build
-%configure --disable-update-databases
+%configure	--disable-dependency-tracking \
+		--disable-static \
+		--disable-update-databases \
+		--disable-xml-catalog-update \
+		--docdir=%{bluefish_docdir}
 make %{?_smp_mflags}
 
 %install
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
-
-make DESTDIR=$RPM_BUILD_ROOT install
-
-# added JIS to default encoding 
-echo "JIS (Japanese):ISO-2022-JP:" >> \
-    $RPM_BUILD_ROOT%{_datadir}/bluefish/encodings.default
-
-rm -rf $RPM_BUILD_ROOT%{_libdir}/bluefish/*.la
+rm -rf %{buildroot}
+mkdir -p %{buildroot}%{_datadir}/applications
+make install DESTDIR=%{buildroot} INSTALL="install -p"
+
+# Make zencoding plugin scripts executable to placate rpmlint
+find %{buildroot}%{_datadir}/bluefish/plugins/zencoding -name '*.py' |
+	xargs awk '/^#!/ { print FILENAME }' |
+	xargs chmod -c +x
+
+%find_lang %{name}
+%find_lang %{name}_plugin_about
+%find_lang %{name}_plugin_charmap
+%find_lang %{name}_plugin_entities
+%find_lang %{name}_plugin_htmlbar
+%find_lang %{name}_plugin_infbrowser
+%find_lang %{name}_plugin_snippets
+%find_lang %{name}_plugin_zencoding
+cat %{name}_plugin_{about,charmap,entities,htmlbar,infbrowser,snippets,zencoding}.lang >> \
+	%{name}.lang
+
+desktop-file-validate \
+	%{buildroot}%{_datadir}/applications/%{name}.desktop
+
+# Manually install docs so that they go into
+# %%{bluefish_docdir} even though we put them in the
+# shared-data subpackage
+install -m 644 -p -t %{buildroot}%{bluefish_docdir}/ \
+	AUTHORS ChangeLog COPYING NEWS README TODO
+
+# Unpackaged files
+rm -f %{buildroot}%{_libdir}/%{name}/*.la
 
-#remove docs because duplicate
-rm -rf $RPM_BUILD_ROOT%{_datadir}/doc
-rm -rf $RPM_BUILD_ROOT%{_datadir}/applications/bluefish-project.desktop
+%clean
+rm -rf %{buildroot}
 
-%post 
-touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
+%post
+/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
+/usr/bin/update-desktop-database &> /dev/null || :
+/usr/bin/xmlcatalog --noout --add 'delegateURI' \
+	'http://bluefish.openoffice.nl/ns/bflang/2.0/' \
+	'%{_datadir}/xml/%{name}' \
+	%{_sysconfdir}/xml/catalog &> /dev/null || :
 
 %postun
-if [ $1 -eq 0 ] ; then
-    update-desktop-database -q  &> /dev/null || :
-    update-mime-database %{_datadir}/mime &> /dev/null || :
-    touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
-    gtk-update-icon-cache %{_datadir}/icons/hicolor  &> /dev/null || :
+/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
+/usr/bin/update-desktop-database &> /dev/null || :
+if [ "$1" = 0 ]; then
+	/usr/bin/xmlcatalog --noout --del \
+		'http://bluefish.openoffice.nl/ns/bflang/2.0/' \
+		%{_sysconfdir}/xml/catalog &> /dev/null || :
 fi
 
-%posttrans
-update-desktop-database -q  &> /dev/null || :
-update-mime-database %{_datadir}/mime &> /dev/null || :
-gtk-update-icon-cache %{_datadir}/icons/hicolor  &> /dev/null || :
-
-%clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
-
 %files
-%defattr(-, root, root)
-%doc [A-LN-Z]*
-%{_bindir}/bluefish
-%dir %{_libdir}/bluefish
-%{_libdir}/bluefish/*.so
-%{_datadir}/bluefish
-%{_datadir}/icons/hicolor/*
-%{_datadir}/pixmaps/*
-%{_datadir}/applications/bluefish.desktop
-%{_datadir}/locale/*/*/*.mo
-%{_datadir}/mime/packages/*.xml
-%{_datadir}/xml/bluefish
-%{_mandir}/man1/*
+%defattr(-,root,root,-)
+%{_bindir}/%{name}
+%{_libdir}/%{name}/
+
+%files shared-data -f %{name}.lang
+%defattr(-,root,root,-)
+%doc %{bluefish_docdir}/
+%{_datadir}/%{name}/
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/mime/packages/%{name}.xml
+%{_datadir}/icons/hicolor/*/mimetypes/application-x-bluefish-project.png
+%{_datadir}/icons/hicolor/*/apps/%{name}.png
+%{_datadir}/icons/hicolor/scalable/mimetypes/bluefish-project.svg
+%{_datadir}/icons/hicolor/scalable/apps/bluefish-icon.svg
+%{_datadir}/pixmaps/application-x-bluefish-project.png
+%{_datadir}/pixmaps/%{name}.png
+%{_datadir}/xml/%{name}/
+%{_mandir}/man1/%{name}.1*
 
 %changelog
+* Thu Jan 23 2014 TANAKA hiroaki <mosaicist@jcom.home.ne.jp> 2.2.4
+- all resources renew from fedora bluefish-2.2.4-3.fc20.src.rpm
+
 * Sun Aug 21 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.0.3-1
 - new upstream release
 - built without gucharmap (VineSeed)