rpms/gambas/FC-4 gambas-1.0.11-desktopfix.patch, NONE, 1.1 gambas.spec, 1.7, 1.8 sources, 1.4, 1.5

[Tom Callaway (spot)]

Author: spot

Update of /cvs/extras/rpms/gambas/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5465/FC-4

Modified Files:
	gambas.spec sources 
Added Files:
	gambas-1.0.11-desktopfix.patch 
Log Message:

Bump to gambas 1.0.11, add desktop entry, icon.


gambas-1.0.11-desktopfix.patch:

--- NEW FILE gambas-1.0.11-desktopfix.patch ---
--- gambas-1.0.11/debian/gambas.desktop.DESK	2004-09-22 06:10:47.000000000 -0500
+++ gambas-1.0.11/debian/gambas.desktop	2005-09-05 00:01:06.000000000 -0500
@@ -1,14 +1,12 @@
 [Desktop Entry]
 Encoding=UTF-8
-Version=1.0
 Exec=gambas
-TryExec=
 Icon=/usr/share/pixmaps/gambas.png
-X-GNOME-DocPath=
 Terminal=false
 Name=Gambas
 Name[es_ES]=Gambas
-GenericName[es_ES]=
+GenericName=Basic IDE
+Comment=IDE based on a Basic interpreter
 Comment[es_ES]=Gambas casi es Visual Basic
 Type=Application
 Categories=GNOME;Application;Development;


Index: gambas.spec
===================================================================
RCS file: /cvs/extras/rpms/gambas/FC-4/gambas.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gambas.spec	29 Jul 2005 19:17:23 -0000	1.7
+++ gambas.spec	5 Sep 2005 15:12:28 -0000	1.8
@@ -1,7 +1,7 @@
 Name:		gambas
 Summary: 	IDE based on a basic interpreter with object extensions
-Version: 	1.0.9
-Release: 	2%{?dist}
+Version: 	1.0.11
+Release: 	1%{?dist}
 License: 	GPL
 Group: 		Development/Tools
 URL: 		http://gambas.sourceforge.net/
@@ -9,6 +9,9 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	kdelibs-devel, automake, autoconf, SDL-devel 
 BuildRequires:	mysql-devel, postgresql-devel, sqlite2-devel 
+BuildRequires:	desktop-file-utils
+Requires(post): desktop-file-utils
+Requires(postun): desktop-file-utils
 # Code is not 64 bit clean.
 ExcludeArch:	x86_64
 # Code is not endian clean.
@@ -16,6 +19,7 @@
 Patch0:		gambas-1.0.9-gcc4.patch
 Patch1:		gambas-1.0.6-dont-make-links.patch
 Patch2:		gambas-1.0.6-noopt.patch
+Patch3:		gambas-1.0.11-desktopfix.patch
 
 %description
 Gambas is a free development environment based on a Basic interpreter
@@ -55,6 +59,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 # Gambas can't deal with -Wp,-D_FORTIFY_SOURCE=2
@@ -81,15 +86,29 @@
 rm -rf $RPM_BUILD_ROOT
 export PATH=$RPM_BUILD_ROOT/usr/bin:$PATH
 make DESTDIR=$RPM_BUILD_ROOT install
-rm -rf $RPM_BUILD_ROOT/%{_libdir}/gambas/*.la
+rm -rf $RPM_BUILD_ROOT%{_libdir}/gambas/*.la
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+install -m0644 ./app/gambas/.icon/32.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/gambas.png
 install src/share/gambas.h $RPM_BUILD_ROOT/%{_includedir}
 
+desktop-file-install --vendor fedora			\
+  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications	\
+  --add-category X-Fedora				\
+  debian/gambas.desktop
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
+%post 
+/sbin/ldconfig
+update-desktop-database %{_datadir}/applications &> /dev/null
+
+%postun
+/sbin/ldconfig
+if [ "$1" = "0" ]; then
+  update-desktop-database %{_datadir}/applications &> /dev/null
+fi
 
 %files
 %defattr(-, root, root, 0755)
@@ -103,6 +122,8 @@
 %{_bindir}/gbi
 %{_bindir}/gbx
 %{_bindir}/gambas-database-manager
+%{_datadir}/pixmaps/gambas.png
+%{_datadir}/applications/*.desktop
 
 %files devel
 %defattr(-, root, root, 0755)
@@ -121,6 +142,10 @@
 %{_datadir}/gambas/examples
 
 %changelog
+* Sun Sep  4 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.11-1
+- bump to 1.0.11
+- add gambas.desktop, gambas.png
+
 * Fri Jul 29 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.9-2
 - put in correct patch
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gambas/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	29 Jul 2005 19:06:53 -0000	1.4
+++ sources	5 Sep 2005 15:12:28 -0000	1.5
@@ -1,3 +1,4 @@
 608772c93233eea4e488ba3bd1c2ac83  gambas-1.0.6.tar.bz2
 730b690c72689e26888698233fdef726  gambas-1.0.8.tar.bz2
 888494096dfb4f497dcfed58179980fa  gambas-1.0.9.tar.bz2
+819eab8e69f71a76248c2679b3af9946  gambas-1.0.11.tar.bz2