rpms/gnumeric/devel .cvsignore, 1.3, 1.4 gnumeric.spec, 1.14, 1.15 sources, 1.3, 1.4

Fri Feb 17 00:25:39 UTC 2006

Author: jwrdegoede

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

Modified Files:
	.cvsignore gnumeric.spec sources 
Log Message:
* Thu Feb 16 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.6.2-1
- New upstream version
- Rebuild for new gcc4.1 and glibc
- add %{?dist} for consistency with my other packages
- Update scripts to match the scriptlets wiki page



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnumeric/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4

--- .cvsignore	27 Nov 2005 20:43:00 -0000	1.3
+++ .cvsignore	17 Feb 2006 00:25:39 -0000	1.4
@@ -1 +1 @@
-gnumeric-1.6.1.tar.bz2
+gnumeric-1.6.2.tar.bz2


Index: gnumeric.spec
===================================================================
RCS file: /cvs/extras/rpms/gnumeric/devel/gnumeric.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gnumeric.spec	21 Jan 2006 08:13:21 -0000	1.14
+++ gnumeric.spec	17 Feb 2006 00:25:39 -0000	1.15
@@ -1,31 +1,36 @@
-Summary:        A spreadsheet program for GNOME.
-Name:     	gnumeric
-Version: 	1.6.1
-Release: 	3
-Epoch:		1
-License:	GPL
-Group:		Applications/Productivity
-Source: 	ftp://ftp.gnome.org/pub/GNOME/sources/gnumeric/1.2/gnumeric-%{version}.tar.bz2
-URL:		http://www.gnome.org/gnumeric/
-BuildRoot:	%{_tmppath}/%{name}-%{version}-root
-BuildRequires:  desktop-file-utils >= 0.9
-BuildRequires:  libgnomeui-devel >= 2.4.0
-BuildRequires:  libgnomeprintui22-devel >= 2.8.2
-BuildRequires:  python-devel
-BuildRequires:  libgsf-devel >= 1.13.2
-BuildRequires:  automake autoconf libtool
-BuildRequires:  intltool scrollkeeper gettext
-BuildRequires:  libgnomedb-devel >= 1.0.4
-BuildRequires:  pygtk2-devel >= 2.6.0
-BuildRequires:  goffice-devel >= 0.1.2-3
-BuildRequires:  guile-devel
-Patch0: gnumeric-1.6.1-desktop.patch
-Patch1: gnumeric-1.4.1-excelcrash.patch
+Summary:          A spreadsheet program for GNOME.
+Name:             gnumeric
+Version:          1.6.2
+Release:          1%{?dist}
+Epoch:            1
+License:          GPL
+Group:            Applications/Productivity
+Source:           ftp://ftp.gnome.org/pub/GNOME/sources/gnumeric/1.2/gnumeric-%{version}.tar.bz2
+URL:              http://www.gnome.org/gnumeric/
+BuildRoot:        %{_tmppath}/%{name}-%{version}-root
+BuildRequires:    desktop-file-utils >= 0.9
+BuildRequires:    libgnomeui-devel >= 2.4.0
+BuildRequires:    libgnomeprintui22-devel >= 2.8.2
+BuildRequires:    python-devel
+BuildRequires:    libgsf-devel >= 1.13.2
+BuildRequires:    automake autoconf libtool
+BuildRequires:    intltool scrollkeeper gettext
+BuildRequires:    libgnomedb-devel >= 1.0.4
+BuildRequires:    pygtk2-devel >= 2.6.0
+BuildRequires:    goffice-devel >= 0.2.0
+BuildRequires:    guile-devel
+Patch0:           gnumeric-1.6.1-desktop.patch
+Patch1:           gnumeric-1.4.1-excelcrash.patch
+Requires(pre):    GConf2
+Requires(post):   /sbin/ldconfig GConf2 scrollkeeper
+Requires(preun):  GConf2
+Requires(postun): /sbin/ldconfig scrollkeeper
 
 %description
 Gnumeric is a spreadsheet program for the GNOME GUI desktop
 environment.
 
+
 %package devel
 Summary: Files necessary to develop gnumeric-based applications.
 Group: Development/Libraries
@@ -36,11 +41,13 @@
 environment. The gnumeric-devel package includes files necessary to
 develop gnumeric-based applications.
 
+
 %prep
 %setup -q
 %patch0 -p1 -b .desktop
 %patch1 -p1 -b .excelcrash
 
+
 %build
 libtoolize --force --copy && aclocal && autoconf
 export mllibname=%{_lib}
@@ -48,6 +55,7 @@
 
 OLD_PO_FILE_INPUT=yes make
 
+
 %install
 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
 
@@ -88,27 +96,48 @@
 rm -rf $RPM_BUILD_ROOT/%{_libdir}/libspreadsheet.la
 rm -rf $RPM_BUILD_ROOT/%{_libdir}/gnumeric/%{version}/plugins/*/*.la
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
+%pre
+if [ "$1" -gt 1 ]; then
+    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+    gconftool-2 --makefile-uninstall-rule \
+      %{_sysconfdir}/gconf/schemas/gnumeric*.schemas > /dev/null || :
+fi
+
+
 %post
 /sbin/ldconfig
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-/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
-touch %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
+/usr/bin/gconftool-2 --makefile-install-rule \
+  %{_sysconfdir}/gconf/schemas/gnumeric*.schemas > /dev/null || :
+scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+
+%preun
+if [ "$1" -eq 0 ]; then
+    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+    gconftool-2 --makefile-uninstall-rule \
+      %{_sysconfdir}/gconf/schemas/gnumeric*.schemas > /dev/null || :
 fi
 
+
 %postun
 /sbin/ldconfig
-if which scrollkeeper-update >/dev/null 2>&1; then scrollkeeper-update; fi
-touch %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
+scrollkeeper-update -q || :
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
+
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc HACKING AUTHORS ChangeLog NEWS BUGS README COPYING
@@ -133,7 +162,14 @@
 %dir %{_datadir}/gnumeric/%{version}/idl
 %{_datadir}/gnumeric/%{version}/idl/*.idl
 
+
 %changelog
+* Thu Feb 16 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.6.2-1
+- New upstream version
+- Rebuild for new gcc4.1 and glibc
+- add %%{?dist} for consistency with my other packages
+- Update scripts to match the scriptlets wiki page
+
 * Sat Jan 21 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.6.1-3
 - Cleanup Requires
 - Add (missing) call of gtk-update-icon-cache to %%post and %%postun


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnumeric/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	27 Nov 2005 20:43:00 -0000	1.3
+++ sources	17 Feb 2006 00:25:39 -0000	1.4
@@ -1 +1 @@
-e6f769e4e74c29ffea0305d48691fe28  gnumeric-1.6.1.tar.bz2
+ca6ecf464279297a4f3d41e7f35ebb39  gnumeric-1.6.2.tar.bz2


