packages: bluefish/bluefish.spec, bluefish/bluefish-desktop.patch, bluefish...
jasw
jasw at pld-linux.org
Sun Apr 11 20:01:46 CEST 2010
Author: jasw Date: Sun Apr 11 18:01:46 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- starting up to 2.0.0
- rel 0.1
---- Files affected:
packages/bluefish:
bluefish.spec (1.88 -> 1.89) , bluefish-desktop.patch (1.7 -> 1.8) , bluefish-locales.patch (1.5 -> 1.6)
---- Diffs:
================================================================
Index: packages/bluefish/bluefish.spec
diff -u packages/bluefish/bluefish.spec:1.88 packages/bluefish/bluefish.spec:1.89
--- packages/bluefish/bluefish.spec:1.88 Thu May 14 10:33:59 2009
+++ packages/bluefish/bluefish.spec Sun Apr 11 20:01:38 2010
@@ -1,7 +1,7 @@
# $Revision$, $Date$
#
# Conditional build:
-%bcond_with opts # use extra optimizations
+%bcond_with python # enable python integration (HIGHLY EXPERIMENTAL)
#
# note: optflags used with this bcond are very strong, and partially
# obsoleted for C (like -fno-rtti) - use at own risk!
@@ -9,18 +9,17 @@
Summary: Bluefish - HTML editor for the experienced web designer
Summary(pl.UTF-8): Bluefish - Edytor HTML-a dla zaawansowanych
Name: bluefish
-Version: 1.0.7
-Release: 4
+Version: 2.0.0
+Release: 0.1
License: GPL
Group: X11/Applications/Editors
# The master server is here
Source0: http://www.bennewitz.com/bluefish/stable/source/%{name}-%{version}.tar.bz2
-# Source0-md5: 2c3b3c9c8f8e32b9473dfd879f216dea
+# Source0-md5: ac9b1e8ef6d5691718a0daa6c78d5618
# but if you want ftp: try this one
# Source0: ftp://bluefish.advancecreations.com/bluefish/downloads/%{name}-%{version}.tar.bz2
Patch0: %{name}-desktop.patch
-Patch1: %{name}-home_etc.patch
-Patch2: %{name}-locales.patch
+Patch1: %{name}-locales.patch
URL: http://bluefish.openoffice.nl/
BuildRequires: aspell-devel
BuildRequires: autoconf
@@ -28,13 +27,14 @@
BuildRequires: gettext-devel
BuildRequires: giflib-devel
BuildRequires: gnome-vfs2-devel >= 2.2
-BuildRequires: gtk+2-devel
-BuildRequires: home-etc-devel
+BuildRequires: gtk+2-devel >= 2.14
+BuildRequires: intltool
BuildRequires: libbonobo-devel >= 2.2
BuildRequires: libjpeg-devel
BuildRequires: libpng >= 1.2.5
BuildRequires: libtiff-devel
-BuildRequires: pcre-devel
+BuildRequires: libtool
+BuildRequires: pcre-devel >= 3.0
BuildRequires: pkgconfig
BuildRequires: rpmbuild(macros) >= 1.311
Requires(post,postun): desktop-file-utils
@@ -62,39 +62,36 @@
%prep
%setup -q
-%patch0 -p1
+%patch0 -p0
%patch1 -p1
-%patch2 -p1
-mv -f po/{no,nb}.po
mv -f po/sr{, at Latn}.po
+mv -f src/plugin_about/po/sr{, at Latn}.po
+mv -f src/plugin_charmap/po/sr{, at Latn}.po
+mv -f src/plugin_entities/po/sr{, at Latn}.po
+mv -f src/plugin_htmlbar/po/sr{, at Latn}.po
+mv -f src/plugin_infbrowser/po/sr{, at Latn}.po
+mv -f src/plugin_snippets/po/sr{, at Latn}.po
-%build
+%{__intltoolize}
+%{__libtoolize}
%{__aclocal}
%{__autoconf}
%configure \
--disable-update-databases \
- --with-freedesktop_org-mime=/usr/share/mime \
- --without-gnome2_4-mime \
- --without-gnome2_4-appreg \
- %{?with_opts:--enable-auto-optimization}
+ %{?with_python:--enable-python}
%{__make}
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_iconsdir}/hicolor/48x48/mimetypes
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-mv -f $RPM_BUILD_ROOT%{_pixmapsdir}/gnome-mime-application-bluefish-project.png \
- $RPM_BUILD_ROOT%{_iconsdir}/hicolor/48x48/mimetypes/gnome-mime-application-bluefish-project.png
-rm -f $RPM_BUILD_ROOT%{_desktopdir}/bluefish-project.desktop
-
-[ -d $RPM_BUILD_ROOT%{_datadir}/locale/sr at latin ] || \
- mv -f $RPM_BUILD_ROOT%{_datadir}/locale/sr@{Latn,latin}
-%find_lang %{name}
+mv %{buildroot}/%{_docdir}/bluefish/* %{buildroot}/%{_docdir}/bluefish-%{version}/
+
+%find_lang %{name} --all-name
%clean
rm -rf $RPM_BUILD_ROOT
@@ -111,14 +108,44 @@
%files -f %{name}.lang
%defattr(644,root,root,755)
-%doc AUTHORS README TODO
+%doc AUTHORS README TODO
%attr(755,root,root) %{_bindir}/bluefish
-%{_datadir}/%{name}
+%dir %{_datadir}/%{name}
%{_datadir}/mime/packages/bluefish.xml
+%dir %{_datadir}/xml/bluefish
+%{_datadir}/xml/bluefish/catalog.xml
+%{_datadir}/xml/bluefish/2.0/bflang2.rng
+%{_datadir}/bluefish/bflang/*.bflang2
+%{_datadir}/bluefish/bflang/*.bfinc
+%{_datadir}/bluefish/bflib/*.gz
%{_mandir}/man1/bluefish.1*
-%{_iconsdir}/hicolor/48x48/mimetypes/gnome-mime-application-bluefish-project.png
+%{_iconsdir}/hicolor/128x128/apps/bluefish.png
+%{_iconsdir}/hicolor/128x128/mimetypes/application-x-bluefish-project.png
+%{_iconsdir}/hicolor/16x16/apps/bluefish.png
+%{_iconsdir}/hicolor/16x16/mimetypes/application-x-bluefish-project.png
+%{_iconsdir}/hicolor/192x192/apps/bluefish.png
+%{_iconsdir}/hicolor/192x192/mimetypes/application-x-bluefish-project.png
+%{_iconsdir}/hicolor/22x22/apps/bluefish.png
+%{_iconsdir}/hicolor/22x22/mimetypes/application-x-bluefish-project.png
+%{_iconsdir}/hicolor/32x32/apps/bluefish.png
+%{_iconsdir}/hicolor/32x32/mimetypes/application-x-bluefish-project.png
+%{_iconsdir}/hicolor/36x36/apps/bluefish.png
+%{_iconsdir}/hicolor/36x36/mimetypes/application-x-bluefish-project.png
+%{_iconsdir}/hicolor/48x48/apps/bluefish.png
+%{_iconsdir}/hicolor/48x48/mimetypes/application-x-bluefish-project.png
+%{_iconsdir}/hicolor/64x64/apps/bluefish.png
+%{_iconsdir}/hicolor/64x64/mimetypes/application-x-bluefish-project.png
+%{_iconsdir}/hicolor/72x72/apps/bluefish.png
+%{_iconsdir}/hicolor/72x72/mimetypes/application-x-bluefish-project.png
+%{_iconsdir}/hicolor/96x96/apps/bluefish.png
+%{_iconsdir}/hicolor/96x96/mimetypes/application-x-bluefish-project.png
+%{_iconsdir}/hicolor/scalable/apps/bluefish-icon.svg
+%{_iconsdir}/hicolor/scalable/mimetypes/bluefish-project.svg
%{_desktopdir}/bluefish.desktop
-%{_pixmapsdir}/bluefish-icon.png
+%{_pixmapsdir}/application-x-bluefish-project.png
+%{_pixmapsdir}/bluefish.png
+%dir %{_libdir}/bluefish
+%attr(755,root,root) %{_libdir}/bluefish/*.so
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -126,6 +153,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.89 2010/04/11 18:01:38 jasw
+- starting up to 2.0.0
+- rel 0.1
+
Revision 1.88 2009/05/14 08:33:59 paszczus
- added missing Require: gnome-vfs2 (without it bluefish got SIGSEGV); rel 4
================================================================
Index: packages/bluefish/bluefish-desktop.patch
diff -u packages/bluefish/bluefish-desktop.patch:1.7 packages/bluefish/bluefish-desktop.patch:1.8
--- packages/bluefish/bluefish-desktop.patch:1.7 Wed Feb 7 14:17:09 2007
+++ packages/bluefish/bluefish-desktop.patch Sun Apr 11 20:01:38 2010
@@ -1,22 +1,18 @@
-diff -urN bluefish-1.0.7/data/bluefish.desktop.in bluefish-1.0.7.new/data/bluefish.desktop.in
---- bluefish-1.0.7/data/bluefish.desktop.in 2006-01-31 07:23:18.000000000 +0100
-+++ bluefish-1.0.7.new/data/bluefish.desktop.in 2007-02-07 12:13:49.000000000 +0100
-@@ -2,14 +2,16 @@
- Name=Bluefish Editor
- Name[de]=Bluefish Editor
- Name[fr]=Éditeur Bluefish
-+Name[pl]=Edytor Bluefish
- Comment=Create web pages
- Comment[de]=Webseiten erstellen
- Comment[fr]=Éditeur pour développeurs web
-+Comment[pl]=Edytor do tworzenia stron internetowych
- Exec=bluefish %F
--Icon=ICONDIR/bluefish-icon.png
-+Icon=bluefish-icon.png
- Terminal=false
- Type=Application
--Categories=GTK;GNOME;Application;Development;WebDevelopment;
-+Categories=GTK;GNOME;Development;WebDevelopment;
- Encoding=UTF-8
- StartupNotify=true
- MimeType=text/html;text/css;text/x-javascript;text/x-python;text/x-perl;application/x-php;text/x-java;text/javascript;text/x-php;application/x-cgi;application/x-javascript;application/x-perl;application/x-python;application/xhtml+xml;text/mathml;text/x-csrc;text/x-chdr;text/x-dtd;text/x-sql;text/xml;
+--- po/pl_org.po 2009-12-18 03:11:26.000000000 +0100
++++ po/pl.po 2010-04-11 19:16:02.435191793 +0200
+@@ -15,13 +15,12 @@
+ "Content-Transfer-Encoding: 8 bit\n"
+
+ #: ../desktop-data/bluefish.desktop.in.h:1 ../src/bluefish.c:79
+-#, fuzzy
+ msgid "Bluefish Editor"
+-msgstr "Podpowiedź Bluefish:"
++msgstr "Edytor Bluefish"
+
+ #: ../desktop-data/bluefish.desktop.in.h:2
+ msgid "Web Development Editor"
+-msgstr ""
++msgstr "Edytor do tworzenia stron www"
+
+ #: ../desktop-data/bluefish.xml.in.h:1
+ #, fuzzy
================================================================
Index: packages/bluefish/bluefish-locales.patch
diff -u packages/bluefish/bluefish-locales.patch:1.5 packages/bluefish/bluefish-locales.patch:1.6
--- packages/bluefish/bluefish-locales.patch:1.5 Wed Feb 7 14:17:09 2007
+++ packages/bluefish/bluefish-locales.patch Sun Apr 11 20:01:38 2010
@@ -1,24 +1,11 @@
-diff -urN bluefish-1.0.7/configure.ac bluefish-1.0.7.new/configure.ac
---- bluefish-1.0.7/configure.ac 2007-02-07 11:33:01.000000000 +0100
-+++ bluefish-1.0.7.new/configure.ac 2007-02-07 11:36:56.000000000 +0100
-@@ -30,7 +30,7 @@
- AC_DEFINE_UNQUOTED(CONFIGURE_OPTIONS, "$0 $*")
-
- # these are the languages that will be installed, so these should be finished
--ALL_LINGUAS="bg cs da de es eu fi fr hu it ja no pl pt pt_BR ru sk sr sv ta tr zh_CN zh_TW"
-+ALL_LINGUAS="bg cs da de es eu fi fr hu it ja nb nl pl pt pt_BR ru sk sr at Latn sv ta tr zh_CN zh_TW"
- AC_SUBST(ALL_LINGUAS)
-
+--- configure.ac 2010-02-15 14:56:18.000000000 +0100
++++ .new/configure.ac 2010-04-11 19:23:08.438559743 +0200
+@@ -34,7 +34,7 @@
+ dnl I18N options
dnl ************************
-diff -urN bluefish-1.0.7/po/Makefile.in bluefish-1.0.7.new/po/Makefile.in
---- bluefish-1.0.7/po/Makefile.in 2007-02-07 11:33:01.000000000 +0100
-+++ bluefish-1.0.7.new/po/Makefile.in 2007-02-07 11:37:42.000000000 +0100
-@@ -26,7 +26,7 @@
- XGETTEXT = @XGETTEXT@
- MSGMERGE = @MSGMERGE@
-
--SRCS = bg.po cs.po da.po de.po el.po es.po eu.po fi.po fr.po hu.po it.po ja.po nl.po no.po pl.po pt.po pt_BR.po ro.po ru.po sk.po sr.po sv.po ta.po tr.po zh_CN.po zh_TW.po
-+SRCS = bg.po cs.po da.po de.po el.po es.po eu.po fi.po fr.po hu.po it.po ja.po nl.po nb.po pl.po pt.po pt_BR.po ro.po ru.po sk.po sr at Latn.po sv.po ta.po tr.po zh_CN.po zh_TW.po
- .SUFFIXES: .po .gmo
- OBJS = $(SRCS:.po=.gmo)
+-ALL_LINGUAS="bg cs da de el es eu fi fr gl hu it ja ko_KR nb nl pl pt pt_BR ro ru sk sr sv ta tr uk zh_CN zh_TW"
++ALL_LINGUAS="bg cs da de el es eu fi fr gl hu it ja ko_KR nb nl pl pt pt_BR ro ru sk sr at Latn sv ta tr uk zh_CN zh_TW"
+ AC_SUBST(ALL_LINGUAS)
+ GETTEXT_PACKAGE=AC_PACKAGE_NAME
+ AC_SUBST(GETTEXT_PACKAGE)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/bluefish/bluefish.spec?r1=1.88&r2=1.89&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/bluefish/bluefish-desktop.patch?r1=1.7&r2=1.8&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/bluefish/bluefish-locales.patch?r1=1.5&r2=1.6&f=u
More information about the pld-cvs-commit
mailing list