rpms/bluefish/devel bluefish.spec,1.26,1.27

[Paul Howarth]

Author: pghmcfc

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

Modified Files:
	bluefish.spec 
Log Message:
* Thu Feb 26 2009 Paul Howarth <paul at city-fan.org> - 1.0.7-6
- Split off shared-data noarch subpackage for Fedora 10 onwards
- Add buildreq gail-devel to fix broken detection of libgnomeui on F-9



Index: bluefish.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluefish/devel/bluefish.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- bluefish.spec	24 Feb 2009 05:14:43 -0000	1.26
+++ bluefish.spec	27 Feb 2009 13:51:52 -0000	1.27
@@ -1,6 +1,15 @@
+# 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
+
 Name:		bluefish
 Version:	1.0.7
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	GTK2 web development application for experienced users
 Group:		Development/Tools
 License:	GPLv2+
@@ -15,12 +24,34 @@
 BuildRequires:	gtk2-devel >= 2.0.6
 BuildRequires:	libgnomeui-devel >= 2.6
 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
 
 %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
+Group:		Development/Tools
+BuildArch:	noarch
+# Requires for directory ownership
+Requires:	gnome-mime-data, shared-mime-info
+
+%description shared-data
+Files common to every architecture version of bluefish.
+%endif
+
 %prep
 %setup -q
 %patch0 -p0
@@ -42,6 +73,13 @@
 	--dir %{buildroot}%{_datadir}/applications		\
 	%{buildroot}%{_datadir}/applications/bluefish-project.desktop
 
+# Manually install docs so that they go into
+# %{_defaultdocdir}/bluefish-%{version} even if we put them in the
+# shared-data subpackage
+%{__install} -d %{buildroot}%{_defaultdocdir}/bluefish-%{version}
+%{__install} -m 644 -p -t %{buildroot}%{_defaultdocdir}/bluefish-%{version}/ \
+	AUTHORS ChangeLog COPYING NEWS README TODO
+
 %clean
 %{__rm} -rf %{buildroot}
 
@@ -53,20 +91,34 @@
 /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,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
+%endif
 %{_bindir}/bluefish
+
+%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/*
-%{_datadir}/bluefish
+%{_datadir}/bluefish/
 %{_datadir}/mime/packages/bluefish.xml
 %{_datadir}/mime-info/*
 %{_datadir}/pixmaps/*
+%{_defaultdocdir}/bluefish-%{version}/
 %{_mandir}/man1/bluefish.1*
 
 %changelog
+* Thu Feb 26 2009 Paul Howarth <paul at city-fan.org> - 1.0.7-6
+- Split off shared-data noarch subpackage for Fedora 10 onwards
+- Add buildreq gail-devel to fix broken detection of libgnomeui on F-9
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.7-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild