rpms/bluefish/devel .cvsignore, 1.9, 1.10 bluefish.spec, 1.30, 1.31 sources, 1.9, 1.10 bluefish-1.0.7-enchant-configure.patch, 1.1, NONE bluefish-1.0.7-enchant.patch, 1.1, NONE bluefish-1.0.7-syntax-highlight.patch, 1.1, NONE

[Paul Howarth]

Author: pghmcfc

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

Modified Files:
	.cvsignore bluefish.spec sources 
Removed Files:
	bluefish-1.0.7-enchant-configure.patch 
	bluefish-1.0.7-enchant.patch 
	bluefish-1.0.7-syntax-highlight.patch 
Log Message:
- Update to major new version - 2.0.0-rc1 (#549552)
- Drop all patches
- No longer need buildreqs gail-devel, gnome-mime-data, gnome-vfs2-devel
- Buildreq gucharmap-devel >= 2.20 for charmap plugin
- Buildreq intltool for translations
- Buildreq man to check man pages
- Buildreq python-devel for python plugin
- Req findutils and grep for the Advanced Open function
- Use %{name} macro for spec file compatibility with bluefish-unstable
- Call %find_lang multiple times for plugin translations
- Filter provides for plugin shared objects
- Desktop file now installed as part of upstream install process, so use
  desktop-file-validate instead of desktop-file-install
- Explicitly enable python plugin (disabled by default despite docs to contrary)
- All supported releases now have noarch subpackages, so drop conditionals



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bluefish/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	6 Nov 2006 11:05:40 -0000	1.9
+++ .cvsignore	30 Dec 2009 21:34:38 -0000	1.10
@@ -1 +1 @@
-bluefish-1.0.7.tar.bz2
+bluefish-2.0.0-rc1.tar.bz2


Index: bluefish.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluefish/devel/bluefish.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- bluefish.spec	19 Nov 2009 11:47:10 -0000	1.30
+++ bluefish.spec	30 Dec 2009 21:34:38 -0000	1.31
@@ -1,97 +1,99 @@
-# Fedora 10 onwards support noarch subpackages; by using one, we can
-# put the arch-independent data in a common subpackage and save lots
-# of space on the mirrors
-%if 0%{?fedora} > 9
-%global shared_data_package 1
-%else
-%global shared_data_package 0
-%endif
+%global pkgver 2.0.0
+%global prerel rc1
+%global rpmrel 1
 
 Name:		bluefish
-Version:	1.0.7
-Release:	9%{?dist}
+Version:	%{pkgver}
+Release:	%{?prerel:0.}%{rpmrel}%{?prerel:.%{prerel}}%{?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
-Patch1:		bluefish-1.0.7-enchant.patch
-Patch2:		bluefish-1.0.7-enchant-configure.patch
+Source0:	http://www.bennewitz.com/bluefish/stable/source/bluefish-%{version}%{?prerel:-%{prerel}}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	desktop-file-utils
 BuildRequires:	enchant-devel >= 1.4.2
 BuildRequires:	gettext
-BuildRequires:	gnome-mime-data
-BuildRequires:	gnome-vfs2-devel
-BuildRequires:	gtk2-devel >= 2.0.6
+BuildRequires:	glib2-devel >= 2.16
+BuildRequires:	gtk2-devel >= 2.12
+BuildRequires:	gucharmap-devel >= 2.20
+BuildRequires:	intltool
 BuildRequires:	libgnomeui-devel >= 2.6
+BuildRequires:	man
 BuildRequires:	pcre-devel >= 3.9
-# gail-devel needed because libgnomeui->libgnomecanvas chain doesn't pull it
-# in (at least on F-9), and libgnomeui detection fails because of
-# requires.private gail in libgnomecanvas-2.0.pc
-BuildRequires:	gail-devel
-%if %{shared_data_package}
-Requires:	bluefish-shared-data = %{version}-%{release}
-%else
-# Requires for directory ownership
-Requires:	gnome-mime-data, shared-mime-info
-%endif
+BuildRequires:	python-devel
+# 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}
+
+# Don't "provide" plugin shared objects
+%{?filter_setup:
+%filter_provides_in %{_libdir}/%{name}/.*\.so$
+%filter_setup
+}
 
 %description
 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.
 
-%if %{shared_data_package}
 %package shared-data
-Summary:	Architecture-independent data for bluefish
+Summary:	Architecture-independent data for %{name}
 Group:		Development/Tools
 BuildArch:	noarch
-# Requires for directory ownership
-Requires:	gnome-mime-data, shared-mime-info
+# 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 bluefish.
-%endif
+Files common to every architecture version of %{name}.
 
 %prep
-%setup -q
-
-# Upstream patch to work around problem editing syntax highlighting patterns (#390871)
-%patch0 -p0
-
-# Use enchant rather than aspell (#509514, http://bugzilla.gnome.org/587666)
-%patch1 -p1
-%patch2 -p1
+%setup -q -n %{name}-%{version}%{?prerel:-%{prerel}}
 
 %build
-%configure --disable-update-databases
+%configure	--disable-update-databases \
+		--disable-static \
+		--enable-python
 %{__make} %{?_smp_mflags}
 
 %install
 %{__rm} -rf %{buildroot}
 %{__mkdir_p} %{buildroot}%{_datadir}/applications
-%{__make} install \
-	DESTDIR=%{buildroot} \
-	INSTALL="%{__install} -p" \
-	INSTALL_PROGRAM="%{__install} -m 755"
+%{__make} install DESTDIR=%{buildroot} INSTALL="%{__install} -p"
 
 %find_lang %{name}
-/usr/bin/desktop-file-install --vendor fedora --delete-original \
-	--dir %{buildroot}%{_datadir}/applications		\
-	%{buildroot}%{_datadir}/applications/bluefish.desktop
-/usr/bin/desktop-file-install --vendor fedora --delete-original \
-	--dir %{buildroot}%{_datadir}/applications		\
-	%{buildroot}%{_datadir}/applications/bluefish-project.desktop
+%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
+%{__cat} %{name}_plugin_{about,charmap,entities,htmlbar,infbrowser,snippets}.lang >> \
+	%{name}.lang
+
+/usr/bin/desktop-file-validate \
+	%{buildroot}%{_datadir}/applications/%{name}.desktop
 
 # Manually install docs so that they go into
-# %{_defaultdocdir}/bluefish-%{version} even if we put them in the
+# %{_defaultdocdir}/%{name}-%{version} even after we put them in the
 # shared-data subpackage
-%{__install} -d %{buildroot}%{_defaultdocdir}/bluefish-%{version}
-%{__install} -m 644 -p -t %{buildroot}%{_defaultdocdir}/bluefish-%{version}/ \
+%{__install} -d %{buildroot}%{_defaultdocdir}/%{name}-%{version}
+%{__install} -m 644 -p -t %{buildroot}%{_defaultdocdir}/%{name}-%{version}/ \
 	AUTHORS ChangeLog COPYING NEWS README TODO
 
+# Unpackaged files
+%{__rm} -f %{buildroot}%{_libdir}/%{name}/*.la
+
 %clean
 %{__rm} -rf %{buildroot}
 
@@ -103,34 +105,45 @@ Files common to every architecture versi
 /usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
 /usr/bin/update-desktop-database &> /dev/null || :
 
-%if %{shared_data_package}
 %files
 %defattr(-,root,root,-)
-%else
-%files -f %{name}.lang
-%defattr(-,root,root,-)
-%endif
-%{_bindir}/bluefish
+%{_bindir}/%{name}
+%{_libdir}/%{name}/
 
-%if %{shared_data_package}
 %files shared-data -f %{name}.lang
 %defattr(-,root,root,-)
-%endif
-%{_datadir}/applications/fedora-bluefish.desktop
-%{_datadir}/applications/fedora-bluefish-project.desktop
-%{_datadir}/application-registry/bluefish.applications
-%{_datadir}/bluefish/
-%{_datadir}/mime/packages/bluefish.xml
-%{_datadir}/mime-info/bluefish.keys
-%{_datadir}/mime-info/bluefish.mime
-%{_datadir}/pixmaps/bluefish-icon.png
-%{_datadir}/pixmaps/gnome-mime-application-bluefish-project.png
-%{_defaultdocdir}/bluefish-%{version}/
-%{_mandir}/man1/bluefish.1*
+%{_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
+%{_defaultdocdir}/%{name}-%{version}/
+%{_mandir}/man1/%{name}.1*
 
 %changelog
+* 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
+- No longer need buildreqs gail-devel, gnome-mime-data, gnome-vfs2-devel
+- Buildreq gucharmap-devel >= 2.20 for charmap plugin
+- Buildreq intltool for translations
+- Buildreq man to check man pages
+- Buildreq python-devel for python plugin
+- Req findutils and grep for the Advanced Open function
+- Use %%{name} macro for spec file compatibility with bluefish-unstable
+- Call %%find_lang multiple times for plugin translations
+- Filter provides for plugin shared objects
+- Desktop file now installed as part of upstream install process, so use
+  desktop-file-validate instead of desktop-file-install
+- Explicitly enable python plugin (disabled by default despite docs to contrary)
+- All supported releases now have noarch subpackages, so drop conditionals
+
 * Thu Nov 19 2009 Paul Howarth <paul at city-fan.org> - 1.0.7-9
-- Buildreq gnome-mime-data, not pulled in by gnome-vfs2 since 2.24.1-8
+- Buildreq gnome-mime-data, not pulled in by gnome-vfs2 since 2.24.1-8 (#539223)
 - Buildreq enchant-devel >= 1.4.2, needed for enchant_dict_add
 - Make %%files list more explicit
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bluefish/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	6 Nov 2006 11:05:40 -0000	1.9
+++ sources	30 Dec 2009 21:34:38 -0000	1.10
@@ -1 +1 @@
-2c3b3c9c8f8e32b9473dfd879f216dea  bluefish-1.0.7.tar.bz2
+e1c1ee287b21daa336425caa1cca1b70  bluefish-2.0.0-rc1.tar.bz2


--- bluefish-1.0.7-enchant-configure.patch DELETED ---


--- bluefish-1.0.7-enchant.patch DELETED ---


--- bluefish-1.0.7-syntax-highlight.patch DELETED ---