rpms/bluefish/devel bluefish-2.0.0-rc2-snippets.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 bluefish.spec, 1.31, 1.32 sources, 1.10, 1.11

[Paul Howarth]

Author: pghmcfc

Update of /cvs/pkgs/rpms/bluefish/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27389

Modified Files:
	.cvsignore bluefish.spec sources 
Added Files:
	bluefish-2.0.0-rc2-snippets.patch 
Log Message:
* Wed Jan 27 2010 Paul Howarth <paul at city-fan.org> - 2.0.0-0.2.rc2
- Update to 2.0.0-rc2
- Apply upstream patch to re-enable snippets menu
- Disable python plugin on upstream advice (#549552 comment 6)
- Disable dependency tracking to speed up build
- Register XML catalog in %post and %postun


bluefish-2.0.0-rc2-snippets.patch:
 snippets_gui.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE bluefish-2.0.0-rc2-snippets.patch ---
--- trunk/bluefish/src/plugin_snippets/snippets_gui.c	2010/01/27 10:01:21	5711
+++ trunk/bluefish/src/plugin_snippets/snippets_gui.c	2010/01/27 13:46:20	5712
@@ -397,7 +397,7 @@
 	gtk_widget_set_sensitive(gtk_item_factory_get_widget(menumaker, "/New snippet"), (state!=2));
 	gtk_widget_set_sensitive(gtk_item_factory_get_widget(menumaker, "/Delete branch"), (state==1));
 	gtk_widget_set_sensitive(gtk_item_factory_get_widget(menumaker, "/Export"), (state!=0));
-	g_object_unref(menumaker);
+
 	return menu;
 }



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bluefish/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	30 Dec 2009 21:34:38 -0000	1.10
+++ .cvsignore	27 Jan 2010 21:57:14 -0000	1.11
@@ -1 +1 @@
-bluefish-2.0.0-rc1.tar.bz2
+bluefish-2.0.0-rc2.tar.bz2


Index: bluefish.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluefish/devel/bluefish.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- bluefish.spec	30 Dec 2009 21:34:38 -0000	1.31
+++ bluefish.spec	27 Jan 2010 21:57:14 -0000	1.32
@@ -1,6 +1,6 @@
 %global pkgver 2.0.0
-%global prerel rc1
-%global rpmrel 1
+%global prerel rc2
+%global rpmrel 2
 
 Name:		bluefish
 Version:	%{pkgver}
@@ -10,6 +10,7 @@ Group:		Development/Tools
 License:	GPLv2+
 URL:		http://bluefish.openoffice.nl/
 Source0:	http://www.bennewitz.com/bluefish/stable/source/bluefish-%{version}%{?prerel:-%{prerel}}.tar.bz2
+Patch0:		bluefish-2.0.0-rc2-snippets.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	desktop-file-utils
 BuildRequires:	enchant-devel >= 1.4.2
@@ -30,6 +31,10 @@ Requires:	%{name}-shared-data = %{versio
 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$
@@ -60,10 +65,15 @@ Files common to every architecture versi
 %prep
 %setup -q -n %{name}-%{version}%{?prerel:-%{prerel}}
 
+# Apply upstream patch to re-enable snippets menu
+%patch0 -p2
+
 %build
-%configure	--disable-update-databases \
+%configure	--disable-dependency-tracking \
 		--disable-static \
-		--enable-python
+		--disable-update-databases \
+		--disable-xml-catalog-update \
+		--docdir=%{_defaultdocdir}/%{name}-%{version}
 %{__make} %{?_smp_mflags}
 
 %install
@@ -87,7 +97,6 @@ Files common to every architecture versi
 # Manually install docs so that they go into
 # %{_defaultdocdir}/%{name}-%{version} even after we put them in the
 # shared-data subpackage
-%{__install} -d %{buildroot}%{_defaultdocdir}/%{name}-%{version}
 %{__install} -m 644 -p -t %{buildroot}%{_defaultdocdir}/%{name}-%{version}/ \
 	AUTHORS ChangeLog COPYING NEWS README TODO
 
@@ -100,10 +109,19 @@ Files common to every architecture versi
 %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
 /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
 
 %files
 %defattr(-,root,root,-)
@@ -121,10 +139,18 @@ Files common to every architecture versi
 %{_datadir}/icons/hicolor/scalable/apps/bluefish-icon.svg
 %{_datadir}/pixmaps/application-x-bluefish-project.png
 %{_datadir}/pixmaps/%{name}.png
+%{_datadir}/xml/%{name}/
 %{_defaultdocdir}/%{name}-%{version}/
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Wed Jan 27 2010 Paul Howarth <paul at city-fan.org> - 2.0.0-0.2.rc2
+- Update to 2.0.0-rc2
+- Apply upstream patch to re-enable snippets menu
+- Disable python plugin on upstream advice (#549552 comment 6)
+- Disable dependency tracking to speed up build
+- Register XML catalog in %%post and %%postun
+
 * Wed Dec 30 2009 Paul Howarth <paul at city-fan.org> - 2.0.0-0.1.rc1
 - Update to major new version - 2.0.0-rc1 (#549552)
 - Drop all patches


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bluefish/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	30 Dec 2009 21:34:38 -0000	1.10
+++ sources	27 Jan 2010 21:57:14 -0000	1.11
@@ -1 +1 @@
-e1c1ee287b21daa336425caa1cca1b70  bluefish-2.0.0-rc1.tar.bz2
+4ca324ef5b1885876b5112668654577d  bluefish-2.0.0-rc2.tar.bz2