rpms/nip2/devel nip2.desktop,1.5,1.6 nip2.spec,1.26,1.27

[Adam Goode]

Author: agoode

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

Modified Files:
	nip2.desktop nip2.spec 
Log Message:
* Thu Jan  7 2010 Adam Goode <adam at spicenitz.org> - 7.20.7-2
- Enable goffice for charts
- Update desktop file



Index: nip2.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/nip2/devel/nip2.desktop,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- nip2.desktop	6 Dec 2007 02:37:32 -0000	1.5
+++ nip2.desktop	7 Jan 2010 18:43:14 -0000	1.6
@@ -1,5 +1,4 @@
 [Desktop Entry]
-Encoding=UTF-8
 Name=nip2
 Comment=Image manipulation program based on VIPS
 Comment[it]=Programma per la manipolazione di immagini basato su VIPS
@@ -11,4 +10,4 @@ Categories=Graphics;RasterGraphics;
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=NIP2
 StartupNotify=true
-MimeType=image/x-vips
+MimeType=image/x-vips;


Index: nip2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nip2/devel/nip2.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- nip2.spec	7 Jan 2010 17:30:13 -0000	1.26
+++ nip2.spec	7 Jan 2010 18:43:14 -0000	1.27
@@ -1,6 +1,6 @@
 Name:		nip2
 Version:	7.20.7
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Interactive tool for working with large images
 
 Group:		Applications/Multimedia
@@ -16,6 +16,7 @@ BuildRequires:	vips-devel >= 7.20
 BuildRequires:	gtk2-devel shared-mime-info gnome-icon-theme
 BuildRequires:	flex bison intltool fftw-devel libxml2-devel gettext
 BuildRequires:	desktop-file-utils gsl-devel xdg-utils
+BuildRequires:	pkgconfig(libgoffice-0.8)
 
 
 # description taken from Debian package
@@ -42,7 +43,7 @@ find . -name CVS -type d -print0 | xargs
 
 
 %build
-%configure
+%configure --disable-update-desktop
 make %{?_smp_mflags}
 
 
@@ -62,9 +63,6 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/mime
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/mime/packages
 cp -a nip2.xml $RPM_BUILD_ROOT%{_datadir}/mime/packages
 
-# same with desktop file
-rm -rf $RPM_BUILD_ROOT%{_datadir}/applications
-
 # locale stuff
 %find_lang nip2
 
@@ -124,6 +122,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Jan  7 2010 Adam Goode <adam at spicenitz.org> - 7.20.7-2
+- Enable goffice for charts
+- Update desktop file
+
 * Wed Jan  6 2010 Adam Goode <adam at spicenitz.org> - 7.20.7-1
 - New upstream release
     + Faster image painting