SPECS: bluefish.spec - 1.0.1, updated patches, cleanup: removed du...

[freetz]

Author: freetz                       Date: Mon Jun 13 18:15:23 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- 1.0.1, updated patches, cleanup: removed duplicated icon, move mime type
  icon to right place, pass more options to configure (disabling obsoleted
  gnome2.4 stuff), register mime types, remove 'project' desktop, require
  gnome-icon-theme, disabled gettextize macro to avoid build problems,
  require shared-mime-info in post/postun stages, rel.1

---- Files affected:
SPECS:
   bluefish.spec (1.73 -> 1.74) 

---- Diffs:

================================================================
Index: SPECS/bluefish.spec
diff -u SPECS/bluefish.spec:1.73 SPECS/bluefish.spec:1.74
--- SPECS/bluefish.spec:1.73	Tue Apr 12 23:02:05 2005
+++ SPECS/bluefish.spec	Mon Jun 13 20:15:16 2005
@@ -9,8 +9,8 @@
 Summary:	Bluefish - HTML editor for the experienced web designer
 Summary(pl):	Bluefish - Edytor HTML-a dla zaawansowanych
 Name:		bluefish
-Version:	1.0
-Release:	2
+Version:	1.0.1
+Release:	1
 License:	GPL
 Group:		X11/Applications/Editors
 # The master server is here
@@ -21,6 +21,7 @@
 Patch0:		%{name}-desktop.patch
 Patch1:		%{name}-home_etc.patch
 Patch2:		%{name}-locales.patch
+Patch3:		%{name}-po_install.patch
 URL:		http://bluefish.openoffice.nl/
 BuildRequires:	aspell-devel
 BuildRequires:	autoconf
@@ -38,6 +39,8 @@
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.197
 Requires(post,postun):	desktop-file-utils
+Requires(post,postun):  shared-mime-info
+Requires:	gnome-icon-theme
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -59,30 +62,35 @@
 %patch0 -p1
 #%patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 mv -f po/{no,nb}.po
 mv -f po/sr{, at Latn}.po
 
 %build
-%{__gettextize}
+#%%{__gettextize}
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
 %configure \
 	--disable-update-databases \
+	--without-gnome2_4-mime \
+	--without-gnome2_4-appreg \
 	%{?with_opts:--enable-auto-optimization}
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir}}
+install -d $RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir}} \
+	$RPM_BUILD_ROOT%{_iconsdir}/gnome/48x48/mimetypes
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install -c inline_images/bluefish_icon1.png $RPM_BUILD_ROOT%{_pixmapsdir}/bluefish.png
-rm -rf $RPM_BUILD_ROOT%{_datadir}/{application-registry,mime-info}
+rm -f $RPM_BUILD_ROOT%{_desktopdir}/bluefish-project.desktop
+mv $RPM_BUILD_ROOT%{_pixmapsdir}/gnome-application-bluefish-project.png \
+	$RPM_BUILD_ROOT%{_iconsdir}/gnome/48x48/mimetypes
 
 %find_lang %{name}
 
@@ -90,11 +98,17 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
+umask 022
+update-mime-database %{_datadir}/mime ||:
 %update_desktop_database_post
 
 %postun
 %update_desktop_database_postun
-
+if [ $1 = 0 ]; then
+    umask 022
+    update-mime-database %{_datadir}/mime
+fi
+		
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS README TODO
@@ -102,6 +116,7 @@
 %{_datadir}/%{name}
 %{_datadir}/mime/packages/*.xml
 %{_desktopdir}/*
+%{_iconsdir}/gnome/48x48/mimetypes/*.png
 %{_pixmapsdir}/*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -110,6 +125,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.74  2005/06/13 18:15:16  freetz
+- 1.0.1, updated patches, cleanup: removed duplicated icon, move mime type
+  icon to right place, pass more options to configure (disabling obsoleted
+  gnome2.4 stuff), register mime types, remove 'project' desktop, require
+  gnome-icon-theme, disabled gettextize macro to avoid build problems,
+  require shared-mime-info in post/postun stages, rel.1
+
 Revision 1.73  2005/04/12 21:02:05  freetz
 - cleaned up a bit: removed outdated destdir patch, added post/postun
   update-desktop-database, removed obsoleted mime stuff, rel.2
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/bluefish.spec?r1=1.73&r2=1.74&f=u