rpms/gnumeric/devel gnumeric-1.6.1-desktop.patch, 1.1, 1.2 gnumeric.spec, 1.10, 1.11

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/gnumeric/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30195

Modified Files:
	gnumeric-1.6.1-desktop.patch gnumeric.spec 
Log Message:
gnumeric-1.6.1-1

gnumeric-1.6.1-desktop.patch:

Index: gnumeric-1.6.1-desktop.patch
===================================================================
RCS file: /cvs/extras/rpms/gnumeric/devel/gnumeric-1.6.1-desktop.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnumeric-1.6.1-desktop.patch	27 Nov 2005 20:43:00 -0000	1.1
+++ gnumeric-1.6.1-desktop.patch	30 Nov 2005 15:19:12 -0000	1.2
@@ -1,5 +1,5 @@
 --- gnumeric-1.6.1/Makefile.in.desktop	2005-11-14 07:18:15.000000000 +0100
-+++ gnumeric-1.6.1/Makefile.in	2005-11-26 22:53:14.000000000 +0100
++++ gnumeric-1.6.1/Makefile.in	2005-11-30 09:31:13.000000000 +0100
 @@ -344,18 +344,17 @@
  gnew_in_files = gnumeric.desktop.in
  gnew_DATA = gnumeric.desktop
@@ -32,3 +32,14 @@
  gnumeric.desktop: gnumeric.desktop.in Makefile $(INTLTOOL_MERGE) $(POFILES_FULL)
  	 LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@.tmp
  @WITH_GNOME_TRUE@	sed -e 's/F_OR_U/U/' <$@.tmp >$@.tmp2
+--- gnumeric-1.6.1/gnumeric.desktop.in.desktop	2005-11-30 09:31:53.000000000 +0100
++++ gnumeric-1.6.1/gnumeric.desktop.in	2005-11-30 09:31:53.000000000 +0100
+@@ -4,7 +4,7 @@
+ _GenericName=Spreadsheet
+ _Comment=The GNOME Spreadsheet
+ Exec=gnumeric %F_OR_U
+-Icon=gnome-gnumeric.png
++Icon=gnumeric.png
+ Terminal=false
+ Type=Application
+ Categories=Application;Office;Spreadsheet;


Index: gnumeric.spec
===================================================================
RCS file: /cvs/extras/rpms/gnumeric/devel/gnumeric.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gnumeric.spec	27 Nov 2005 20:43:00 -0000	1.10
+++ gnumeric.spec	30 Nov 2005 15:19:12 -0000	1.11
@@ -1,6 +1,3 @@
-%define gnumeric_version %{version}
-%define desktop_file_utils_version 0.9
-
 Summary:        A spreadsheet program for GNOME.
 Name:     	gnumeric
 Version: 	1.6.1
@@ -16,8 +13,8 @@
 Requires:       libgnomeprintui22 >= 2.8.2
 Requires:       gtk2 >= 2.6.0
 Requires:  	libgnomedb >= 1.0.4
-PreReq:         desktop-file-utils >= %{desktop_file_utils_version}
-BuildRequires:  desktop-file-utils >= %{desktop_file_utils_version}
+PreReq:         desktop-file-utils >= 0.9
+BuildRequires:  desktop-file-utils >= 0.9
 BuildRequires:  libgnomeui-devel >= 2.4.0
 BuildRequires:  libgnomeprintui22-devel >= 2.8.2
 BuildRequires:  python-devel
@@ -54,7 +51,7 @@
 libtoolize --force --copy && aclocal && autoconf
 export mllibname=%{_lib}
 export PKG_CONFIG_PATH=%{_libdir}/libgsf-1.13/lib/pkgconfig
-%configure --without-gb
+%configure --without-gb --enable-ssindex
 
 OLD_PO_FILE_INPUT=yes make
 
@@ -66,83 +63,85 @@
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 if [ -f /usr/lib/rpm/find-lang.sh ] ; then
- /usr/lib/rpm/find-lang.sh $RPM_BUILD_ROOT %name
+  /usr/lib/rpm/find-lang.sh $RPM_BUILD_ROOT %name --all-name --with-gnome
 fi
 
 ./mkinstalldirs $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-install --vendor gnome --delete-original                   \
+desktop-file-install --vendor fedora --delete-original                  \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications                         \
-  --add-category X-Red-Hat-Extra                                        \
+  --add-category X-Fedora                                               \
   --add-category Office                                                 \
   --add-category Application                                            \
   --add-category Spreadsheet                                            \
   $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
 
+#put icon in the proper place
+mkdir -p $RPM_BUILD_ROOT/usr/share/icons/hicolor/48x48/apps
+mv $RPM_BUILD_ROOT/usr/share/pixmaps/gnome-gnumeric.png \
+  $RPM_BUILD_ROOT/usr/share/icons/hicolor/48x48/apps/gnumeric.png
+
+#remove unused mime type icons
+rm -rf $RPM_BUILD_ROOT/%{_datadir}/pixmaps/gnome-application-*.png
+rm -rf $RPM_BUILD_ROOT/%{_datadir}/pixmaps/gnumeric-gnome-application-*.png
+
 #remove spurious .ico thing
 rm -rf $RPM_BUILD_ROOT/usr/share/pixmaps/win32-gnumeric.ico
+rm -rf $RPM_BUILD_ROOT/usr/share/pixmaps/gnumeric/win32-gnumeric.ico
 
 #remove scrollkeeper stuff
 rm -rf $RPM_BUILD_ROOT/var
 
+#remove .la files
+rm -rf $RPM_BUILD_ROOT/%{_libdir}/libspreadsheet.la
+rm -rf $RPM_BUILD_ROOT/%{_libdir}/gnumeric/%{version}/plugins/*/*.la
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/ldconfig
-update-desktop-database %{_datadir}/applications
-
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gnumeric*.schemas > /dev/null
+/usr/bin/gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gnumeric*.schemas > /dev/null 2>&1
+if which scrollkeeper-update >/dev/null 2>&1; then scrollkeeper-update; fi
 
 %postun
 /sbin/ldconfig
-update-desktop-database %{_datadir}/applications
+if which scrollkeeper-update >/dev/null 2>&1; then scrollkeeper-update; fi
 
 %files -f %{name}.lang
-
-%defattr (0755, root, root)
+%defattr(-,root,root)
+%doc HACKING AUTHORS ChangeLog NEWS BUGS README COPYING
+%{_sysconfdir}/gconf/schemas/*.schemas
 %{_bindir}/*
-%dir %{_libdir}/gnumeric
-%dir %{_libdir}/gnumeric/%{gnumeric_version}
-%{_libdir}/gnumeric/%{gnumeric_version}/plugins/*
-# guile disabled due to 64-bit crash
-## %{_datadir}/gnumeric/%{gnumeric_version}/guile
-# FIXME - for s390 it builds some more with "--with-pic=-fPIC", but the
-# grep for dlname then still fails.
-
-%defattr (0644, root, root, 0755)
-%doc HACKING AUTHORS ChangeLog NEWS BUGS README COPYING TODO
+%{_libdir}/*.so
+%{_libdir}/gnumeric
+%{_libdir}/bonobo/servers/GNOME_Gnumeric.server
 %{_datadir}/pixmaps/gnumeric
-%{_datadir}/pixmaps/gnome-application-*.png
-%{_datadir}/pixmaps/gnome-gnumeric.png
+%{_datadir}/icons/hicolor/48x48/apps/gnumeric.png
 %dir %{_datadir}/gnumeric
-%dir %{_datadir}/gnumeric/%{gnumeric_version} 
-%dir %{_libdir}/gnumeric/%{gnumeric_version}/plugins
-%{_datadir}/gnumeric/%{gnumeric_version}/*
-%{_datadir}/mime-info/gnumeric.mime
-%dir %{_datadir}/mc
-%dir %{_datadir}/mc/templates
-%{_datadir}/mc/templates/gnumeric.desktop
+%dir %{_datadir}/gnumeric/%{version}
+%{_datadir}/gnumeric/%{version}/*
+%{_datadir}/mime-info
+%{_datadir}/mc
 %{_datadir}/applications/*
-%dir %{_datadir}/omf/gnumeric/
-%{_datadir}/omf/gnumeric/*
-%{_sysconfdir}/gconf/schemas/*.schemas
-%{_libdir}/bonobo/servers/GNOME_Gnumeric.server
+%{_datadir}/omf
 %{_mandir}/man1/*
 
 %files devel
-%defattr (-, root, root)
-%dir %{_datadir}/gnumeric
-%dir %{_datadir}/gnumeric/%{gnumeric_version} 
-%{_datadir}/gnumeric/%{gnumeric_version}/idl/*.idl
-%dir %{_libdir}/gnumeric
-%dir %{_libdir}/gnumeric/%{gnumeric_version}
+%defattr(-,root,root)
+%dir %{_datadir}/gnumeric/%{version}/idl
+%{_datadir}/gnumeric/%{version}/idl/*.idl
 
 %changelog
 * Sat Nov 26 2005 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.6.1-1
 - new upstream stable version 1.6.1
 - drop 2 integrated patches
 - own dirs /usr/share/mc/templates /usr/share/mc (bug 169332)
+- proper use of desktop-file-install (bug 171963)
+- put icon in the proper freedesktop.org spec matching icon dir (bug 171964)
+- remove unused mime-type icons
+- clean up specfile, own all dirs not owned by Required packages.
+- add --enable-ssindex (bug 172164)
 
 * Thu Aug 18 2005 Jeremy Katz <katzj at redhat.com> - 1:1.4.3-6
 - rebuild for changes in the devel tree
@@ -430,4 +429,3 @@
 
 * Thu Jul 13 2000 Prospector <bugzilla at redhat.com>
 - automatic rebuild
-