[svn] r3449 - trunk/rpms/bluefish

packagers at lists.rpmforge.net packagers at lists.rpmforge.net
Mon Aug 1 13:12:15 CEST 2005


Author: thias
Date: 2005-08-01 13:12:15 +0200 (Mon, 01 Aug 2005)
New Revision: 3449

Added:
   trunk/rpms/bluefish/bluefish-1.0.2-desktop_icon.patch
Removed:
   trunk/rpms/bluefish/bluefish-1.0-desktop_icon.patch
Modified:
   trunk/rpms/bluefish/bluefish.spec
Log:
Update bluefish to 1.0.2.


Deleted: trunk/rpms/bluefish/bluefish-1.0-desktop_icon.patch
===================================================================
--- trunk/rpms/bluefish/bluefish-1.0-desktop_icon.patch	2005-08-01 10:31:55 UTC (rev 3448)
+++ trunk/rpms/bluefish/bluefish-1.0-desktop_icon.patch	2005-08-01 11:12:15 UTC (rev 3449)
@@ -1,11 +0,0 @@
---- data/bluefish.desktop.in    2004-11-25 08:45:22.000000000 +0100
-+++ data/bluefish.desktop.in_diff       2004-12-28 15:45:37.477460912 +0100
-@@ -2,7 +2,7 @@
- Name=Bluefish Editor
- Comment=Web Development Editor
- Exec=bluefish -n
--Icon=ICONDIR/bluefish-icon.png
-+Icon=bluefish-icon.png
- Terminal=false
- Type=Application
- Categories=Application;Development;

Added: trunk/rpms/bluefish/bluefish-1.0.2-desktop_icon.patch
===================================================================
--- trunk/rpms/bluefish/bluefish-1.0.2-desktop_icon.patch	2005-08-01 10:31:55 UTC (rev 3448)
+++ trunk/rpms/bluefish/bluefish-1.0.2-desktop_icon.patch	2005-08-01 11:12:15 UTC (rev 3449)
@@ -0,0 +1,24 @@
+diff -Naupr bluefish-1.0.2.orig/data/bluefish.desktop.in bluefish-1.0.2/data/bluefish.desktop.in
+--- bluefish-1.0.2.orig/data/bluefish.desktop.in	2005-05-30 22:47:54.000000000 +0200
++++ bluefish-1.0.2/data/bluefish.desktop.in	2005-08-01 13:09:58.000000000 +0200
+@@ -4,7 +4,7 @@ Name[de]=Bluefish Editor
+ Comment=Web Development Editor
+ Comment[de]=Editor für Web-Entwickler
+ Exec=bluefish %F
+-Icon=ICONDIR/bluefish-icon.png
++Icon=bluefish-icon.png
+ Terminal=false
+ Type=Application
+ Categories=Application;Development;
+diff -Naupr bluefish-1.0.2.orig/data/bluefish-project.desktop.in bluefish-1.0.2/data/bluefish-project.desktop.in
+--- bluefish-1.0.2.orig/data/bluefish-project.desktop.in	2005-05-30 22:47:54.000000000 +0200
++++ bluefish-1.0.2/data/bluefish-project.desktop.in	2005-08-01 13:10:16.000000000 +0200
+@@ -4,7 +4,7 @@ Name[de]=Bluefish Editor
+ Comment=Web Development Editor
+ Comment[de]=Editor für Web-Entwickler
+ Exec=bluefish -n -p %f
+-Icon=ICONDIR/bluefish-icon.png
++Icon=bluefish-icon.png
+ Terminal=false
+ Type=Application
+ NoDisplay=true

Modified: trunk/rpms/bluefish/bluefish.spec
===================================================================
--- trunk/rpms/bluefish/bluefish.spec	2005-08-01 10:31:55 UTC (rev 3448)
+++ trunk/rpms/bluefish/bluefish.spec	2005-08-01 11:12:15 UTC (rev 3449)
@@ -3,18 +3,17 @@
 
 Summary: Graphical web development application for experienced users
 Name: bluefish
-Version: 1.0
+Version: 1.0.2
 Release: 1
 Group: Development/Tools
 License: GPL
 URL: http://bluefish.openoffice.nl/
 Source: http://pkedu.fbt.eitn.wau.nl/~olivier/downloads/bluefish-%{version}.tar.bz2
-Patch: bluefish-1.0-desktop_icon.patch
+Patch: bluefish-1.0.2-desktop_icon.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-
-BuildRequires: gtk2-devel >= 2.0.6, pcre-devel >= 3.9, gnome-vfs2-devel
+Requires: shared-mime-info >= 0.14
+BuildRequires: libgnomeui-devel >= 2.6, pcre-devel >= 3.9, gnome-vfs2-devel
 BuildRequires: aspell-devel, gettext, desktop-file-utils
-Requires: shared-mime-info >= 0.14
 
 %description
 Bluefish is a GTK+ HTML editor for the experienced web designer or
@@ -26,7 +25,7 @@
 
 %prep
 %setup
-%patch -p0 -b .desktop_icon
+%patch -p1 -b .desktop_icon
 
 
 %build
@@ -45,11 +44,11 @@
 
 
 %post
-update-desktop-database -q 2>/dev/null || :
+update-desktop-database -q || :
 
 %postun
-update-mime-database %{_datadir}/mime >/dev/null 2>&1 || :
-update-desktop-database -q 2>/dev/null || :
+update-mime-database %{_datadir}/mime &>/dev/null || :
+update-desktop-database -q || :
 
 
 %files -f %{name}.lang
@@ -65,6 +64,11 @@
 
 
 %changelog
+* Mon Aug  1 2005 Matthias Saou <http://freshrpms.net/> 1.0.2-1
+- Update to 1.0.2.
+- Update desktop icon patch.
+- Now require libgnomeui-devel >= 2.6.
+
 * Wed Jan 12 2005 Matthias Saou <http://freshrpms.net/> 1.0-1
 - Update to 1.0, thanks to Matthias Haase.
 




More information about the commits mailing list