rpms/bluefish/EL-4 bluefish-1.0.7-syntax-highlight.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 bluefish.spec, 1.14, 1.15 sources, 1.8, 1.9
Paul Howarth (pghmcfc)
fedora-extras-commits at redhat.com
Mon Apr 7 17:45:51 UTC 2008
Author: pghmcfc
Update of /cvs/pkgs/rpms/bluefish/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31307
Modified Files:
.cvsignore bluefish.spec sources
Added Files:
bluefish-1.0.7-syntax-highlight.patch
Log Message:
resync with devel
bluefish-1.0.7-syntax-highlight.patch:
--- NEW FILE bluefish-1.0.7-syntax-highlight.patch ---
Index: src/preferences.c
===================================================================
RCS file: /cvsroot/bluefish/bluefish-gtk2/src/preferences.c,v
retrieving revision 1.120.2.10
retrieving revision 1.120.2.11
diff -u -r1.120.2.10 -r1.120.2.11
--- src/preferences.c 12 Nov 2006 03:35:28 -0000 1.120.2.10
+++ src/preferences.c 20 Jan 2008 04:26:25 -0000 1.120.2.11
@@ -162,7 +162,7 @@
GtkWidget *check;
GtkWidget *radio[9];
gchar **curstrarr;
- const gchar *selected_filetype;
+ gchar *selected_filetype;
} Thighlightpatterndialog;
typedef struct {
@@ -910,12 +910,12 @@
}
static void highlightpattern_fill_from_selected_filetype(Tprefdialog *pd) {
- DEBUG_MSG("highlightpattern_popmenu_activate, applied changes, about to clear liststore\n");
+ DEBUG_MSG("highlightpattern_fill_from_selected_filetype, applied changes, about to clear liststore\n");
gtk_list_store_clear(GTK_LIST_STORE(pd->hpd.lstore));
if (pd->hpd.selected_filetype) {
GList *tmplist;
tmplist = g_list_first(pd->lists[highlight_patterns]);
- DEBUG_MSG("highlightpattern_popmenu_activate, about to fill for filetype %s (tmplist=%p)\n",pd->hpd.selected_filetype,tmplist);
+ DEBUG_MSG("highlightpattern_fill_from_selected_filetype, about to fill for filetype %s (tmplist=%p)\n",pd->hpd.selected_filetype,tmplist);
/* fill list model here */
while (tmplist) {
gchar **strarr =(gchar **)tmplist->data;
@@ -923,7 +923,7 @@
DEBUG_MSG("found entry with filetype %s\n",strarr[0]);
if (strcmp(strarr[0], pd->hpd.selected_filetype)==0) {
GtkTreeIter iter;
- DEBUG_MSG("highlightpattern_popmenu_activate, appending pattern %s with filetype %s\n",strarr[1],strarr[0]);
+ DEBUG_MSG("highlightpattern_fill_from_selected_filetype, appending pattern %s with filetype %s\n",strarr[1],strarr[0]);
gtk_list_store_append(GTK_LIST_STORE(pd->hpd.lstore), &iter);
gtk_list_store_set(GTK_LIST_STORE(pd->hpd.lstore), &iter, 0, strarr[1], -1);
}
@@ -949,7 +949,9 @@
highlightpattern_apply_changes(pd);
pd->hpd.curstrarr = NULL;
if (menuitem) {
- pd->hpd.selected_filetype = gtk_label_get_text(GTK_LABEL(GTK_BIN(menuitem)->child));
+ if (pd->hpd.selected_filetype)
+ g_free (pd->hpd.selected_filetype);
+ pd->hpd.selected_filetype = g_strdup (gtk_label_get_text(GTK_LABEL(GTK_BIN(menuitem)->child)));
}
highlightpattern_fill_from_selected_filetype(pd);
}
@@ -1209,6 +1211,7 @@
select = gtk_tree_view_get_selection(GTK_TREE_VIEW(pd->hpd.lview));
g_signal_connect(G_OBJECT(select), "changed",G_CALLBACK(highlightpattern_selection_changed_cb),pd);
+ gtk_tree_selection_set_mode (select, GTK_SELECTION_SINGLE);
}
vbox3 = gtk_vbox_new(FALSE, 2);
@@ -1807,6 +1810,9 @@
pd->lists[browsers] = NULL;
pd->lists[external_commands] = NULL;
+ if (pd->hpd.selected_filetype)
+ g_free (pd->hpd.selected_filetype);
+
/* select = gtk_tree_view_get_selection(GTK_TREE_VIEW(pd->ftd.lview));
g_signal_handlers_destroy(G_OBJECT(select));*/
DEBUG_MSG("preferences_destroy_lcb, destroying handlers for lstore %p\n",pd->ftd.lstore);
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bluefish/EL-4/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 6 Feb 2006 11:57:41 -0000 1.8
+++ .cvsignore 7 Apr 2008 17:45:08 -0000 1.9
@@ -1 +1 @@
-bluefish-1.0.5.tar.bz2
+bluefish-1.0.7.tar.bz2
Index: bluefish.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluefish/EL-4/bluefish.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- bluefish.spec 22 May 2006 07:49:13 -0000 1.14
+++ bluefish.spec 7 Apr 2008 17:45:08 -0000 1.15
@@ -1,23 +1,20 @@
-Name: bluefish
-Version: 1.0.5
-Release: 3%{?dist}
-Summary: GTK2 web development application for experienced users
-Group: Development/Tools
-License: GPL
-URL: http://bluefish.openoffice.nl/
-Source0: http://pkedu.fbt.eitn.wau.nl/~olivier/downloads/bluefish-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: aspell-devel >= 0.5
-BuildRequires: desktop-file-utils
-BuildRequires: gettext
-BuildRequires: gnome-vfs2-devel
-BuildRequires: gtk2-devel >= 2.0.6
-BuildRequires: libgnomeui-devel >= 2.6
-BuildRequires: pcre-devel >= 3.9
-Requires(post): desktop-file-utils
-Requires(post): shared-mime-info
-Requires(postun): desktop-file-utils
-Requires(postun): shared-mime-info
+Name: bluefish
+Version: 1.0.7
+Release: 4%{?dist}
+Summary: GTK2 web development application for experienced users
+Group: Development/Tools
+License: GPLv2+
+URL: http://bluefish.openoffice.nl/
+Source0: http://www.bennewitz.com/bluefish/stable/source/bluefish-%{version}.tar.bz2
+Patch0: bluefish-1.0.7-syntax-highlight.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: aspell-devel >= 0.5
+BuildRequires: desktop-file-utils
+BuildRequires: gettext
+BuildRequires: gnome-vfs2-devel
+BuildRequires: gtk2-devel >= 2.0.6
+BuildRequires: libgnomeui-devel >= 2.6
+BuildRequires: pcre-devel >= 3.9
%description
Bluefish is a powerful editor for experienced web designers and programmers.
@@ -26,6 +23,7 @@
%prep
%setup -q
+%patch0 -p0
%build
%configure --disable-update-databases
@@ -38,24 +36,22 @@
%find_lang %{name}
/usr/bin/desktop-file-install --vendor fedora --delete-original \
- --dir %{buildroot}%{_datadir}/applications \
- --add-category X-Fedora \
- %{buildroot}%{_datadir}/applications/bluefish.desktop
+ --dir %{buildroot}%{_datadir}/applications \
+ %{buildroot}%{_datadir}/applications/bluefish.desktop
/usr/bin/desktop-file-install --vendor fedora --delete-original \
- --dir %{buildroot}%{_datadir}/applications \
- --add-category X-Fedora \
- %{buildroot}%{_datadir}/applications/bluefish-project.desktop
+ --dir %{buildroot}%{_datadir}/applications \
+ %{buildroot}%{_datadir}/applications/bluefish-project.desktop
%clean
%{__rm} -rf %{buildroot}
%post
/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
-/usr/bin/update-desktop-database %{_datadir}/applications &> /dev/null || :
+/usr/bin/update-desktop-database &> /dev/null || :
%postun
/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
-/usr/bin/update-desktop-database %{_datadir}/applications &> /dev/null || :
+/usr/bin/update-desktop-database &> /dev/null || :
%files -f %{name}.lang
%defattr(-,root,root,-)
@@ -71,6 +67,26 @@
%{_mandir}/man1/bluefish.1*
%changelog
+* Thu Feb 14 2008 Paul Howarth <paul at city-fan.org> - 1.0.7-4
+- rebuild with gcc 4.3.0 for Fedora 9
+
+* Mon Jan 21 2008 Paul Howarth <paul at city-fan.org> - 1.0.7-3
+- include patch from upstream VCS to work around problem editing syntax
+ highlighting patterns (#390871)
+
+* Sun Aug 26 2007 Paul Howarth <paul at city-fan.org> - 1.0.7-2
+- clarify license as GPL version 2 or later
+- unexpand tabs in spec
+- update scriptlets and drop scriptlet dependencies
+
+* Mon Nov 6 2006 Paul Howarth <paul at city-fan.org> - 1.0.7-1
+- update to 1.0.7
+- update download URL
+- don't add category X-Fedora in desktop files
+
+* Tue Aug 29 2006 Paul Howarth <paul at city-fan.org> - 1.0.5-4
+- rebuild for dynamic linking speedups (FE6)
+
* Mon May 22 2006 Paul Howarth <paul at city-fan.org> - 1.0.5-3
- fix broken debuginfo packages by not stripping binaries (#192617)
- cosmetic changes to spec file
@@ -157,7 +173,7 @@
* Fri Jul 25 2003 Phillip Compton <pcompton[AT]proteinmedia.com> 0:0.10-0.fdr.2
- Enable feature diferention for shrike vs severn.
- BuildReq aspell-devel for severn.
-- in bluefish.desktop: Terminal=0 => Terminal=false.
+- in bluefish.desktop: Terminal=0 => Terminal=false.
- Source0 path updated.
* Thu Jul 17 2003 Phillip Compton <pcompton[AT]proteinmedia.com> 0:0.10-0.fdr.1
@@ -184,10 +200,10 @@
- Updated to 0.9
* Sat Feb 8 2003 Phillip Compton
--Update to snapshot: 20030207
+- Update to snapshot: 20030207
* Wed Feb 5 2003 Phillip Compton
--Update to snapshot: 20030205
+- Update to snapshot: 20030205
* Wed Jan 15 2003 Matthias Saou <matthias.saou at est.une.marmotte.net>
- Update to the latest snapshot which should be more stable.
@@ -209,23 +225,21 @@
- Added a GNOME desktop entry.
- Compiled with kgcc and reported the problems encountered with gcc 2.96.
-* Fri May 5 2000 Bo Forslund <bo.forslund at abc.se>
- - fine tuning of the spec file
- - possible to build with all processors on smp machines
- - an entry for RedHats wmconfig
+* Fri May 5 2000 Bo Forslund <bo.forslund at abc.se>
+- fine tuning of the spec file
+- possible to build with all processors on smp machines
+- an entry for RedHats wmconfig
* Tue Mar 21 2000 CW Zuckschwerdt <zany at triq.net>
- - complete rewrite of spec file
- - relocateable on build-time
- - no privileges required while building
- - fix for install_location (should really be $(LIBDIR)/bluefish!)
- - included man, locale and lib into RPM (was seriously broken)
+- complete rewrite of spec file
+- relocateable on build-time
+- no privileges required while building
+- fix for install_location (should really be $(LIBDIR)/bluefish!)
+- included man, locale and lib into RPM (was seriously broken)
* Thu Jan 13 2000 Chris Lea <chrislea at luciddesigns.com>
- - Fixed up spec file some. bluefish-0.3.5
+- Fixed up spec file some. bluefish-0.3.5
* Wed Nov 17 1999 Chris Lea <chrislea at luciddesigns.com>
- - added spec file. this is my third RPM that I've made a spec
- file for, so please be merciful if I've screwed something up
-
-- Initial RPM release. <version>
+- added spec file. this is my third RPM that I've made a spec
+ file for, so please be merciful if I've screwed something up
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bluefish/EL-4/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 6 Feb 2006 11:57:41 -0000 1.8
+++ sources 7 Apr 2008 17:45:08 -0000 1.9
@@ -1 +1 @@
-26701c09d41e5dea987155cdc9d0ac94 bluefish-1.0.5.tar.bz2
+2c3b3c9c8f8e32b9473dfd879f216dea bluefish-1.0.7.tar.bz2
More information about the fedora-extras-commits
mailing list