From 13afef92eadf35eb024bb0d6ec95c72a5493204bd6186e31d6b75585603ae395 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Tue, 6 Dec 2011 17:15:16 +0000 Subject: [PATCH 1/3] Updating link to change in openSUSE:Factory/gnumeric revision 61.0 OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/gnumeric?expand=0&rev=d1294f9fe5a817138ae21e031459070c --- gnumeric.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnumeric.spec b/gnumeric.spec index a582650..61cbebe 100644 --- a/gnumeric.spec +++ b/gnumeric.spec @@ -22,7 +22,7 @@ Name: gnumeric Version: 1.10.17 Release: 1 Summary: Spreadsheet Application -License: GPLv2+ +License: GPL-2.0+ Url: http://www.gnumeric.org/ Group: Productivity/Office/Spreadsheets Source0: http://download.gnome.org/sources/gnumeric/1.10/%{name}-%{version}.tar.bz2 @@ -67,7 +67,7 @@ needs. Gnumeric is part of the GNOME project. %package devel -License: GPLv2+ +License: GPL-2.0+ Summary: Spreadsheet Application Group: Productivity/Office/Spreadsheets Requires: %{name} = %{version} glib2-devel goffice-devel gtk2-devel libglade2-devel libgsf-devel libxml2-devel From a1bd3ce0f7f99fc55bcce4196e576dcf174cc249c3f1270a264a1796b2c91568 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Thu, 19 Jan 2012 07:52:46 +0000 Subject: [PATCH 2/3] Accepting request 99549 from home:dimstar:branches:GNOME:Apps Update to 1.11.1 OBS-URL: https://build.opensuse.org/request/show/99549 OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/gnumeric?expand=0&rev=55 --- gnumeric-1.10.17.tar.bz2 | 3 --- gnumeric-1.11.1.tar.xz | 3 +++ gnumeric.changes | 50 ++++++++++++++++++++++++++++++++++++++ gnumeric.spec | 52 +++++++++++++++++----------------------- 4 files changed, 75 insertions(+), 33 deletions(-) delete mode 100644 gnumeric-1.10.17.tar.bz2 create mode 100644 gnumeric-1.11.1.tar.xz diff --git a/gnumeric-1.10.17.tar.bz2 b/gnumeric-1.10.17.tar.bz2 deleted file mode 100644 index 59082f5..0000000 --- a/gnumeric-1.10.17.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bb2a13424811d132fe1be7a6e82d61157a18c630fc91b7409503dbd7ef600ea5 -size 19010738 diff --git a/gnumeric-1.11.1.tar.xz b/gnumeric-1.11.1.tar.xz new file mode 100644 index 0000000..a37d0b7 --- /dev/null +++ b/gnumeric-1.11.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6ebee914a652858534b9d5d7ce4ea4dcbbd97525227a042ee5bbc2e45756dd3e +size 14451268 diff --git a/gnumeric.changes b/gnumeric.changes index 38207b9..90e128b 100644 --- a/gnumeric.changes +++ b/gnumeric.changes @@ -1,3 +1,53 @@ +------------------------------------------------------------------- +Mon Jan 9 16:37:21 UTC 2012 - dimstar@opensuse.org + +- Update to version 1.11.1: + + Make things build against gtk+-3.0. + + Add support for SVG images using librsvg. + + Show range selection cursors even while selecting new regions + and on other sheets + + Fixed expression range cursor behavior [bgo#664852] + + Build fixes relating to embedded ui files [bgo#664828] +- Changes from version 1.11.0: + + Clarify the distinction beween open/save and import/export. + + Fully read scientific format from ODF. + + Provide progress feedback when generating random numbers. + + Add HPFILTER function calculating the Hodrick Prescott Filter. + + Enable markup selection in scientific format selector. + + Be compatible with the changed LibreOffice ODF documents with + tab colours. + + Some more number formatting improvements to ODF import/export. + + Read and write tick spacing from/to ODF files. + + Fix IRR and other functions acting on paired data set when + called with fixed arrays. + + Bugs fixed: bgo#662412, bgo#662413, bgo#584380, bgo#651561, + bgo#655877, bgo#535473, bgo#656799, bgo#634803, bgo#356711, + bgo#657506, bgo#658223, bgo#658916, bgo#660242, bgo#658981, + bgo#660248, bgo#660657, bgo#660605, bgo#661958, bgo#662056, + bgo#662056, bgo#662310, bgo#662331, bgo#662361, bgo#662149, + bgo#425685, bgo#662472, bgo#663078, bgo#627509, bgo#663135, + bgo#603533, bgo#662474, bgo#663117, bgo#661405, bgo#455712, + bgo#664351, bgo#664447, bgo#664754, bgo#645673, bgo#656418, + bgo#645842, bgo#658194, bgo#658639, bgo#657036, bgo#659246, + bgo#660241, bgo#661213, bgo#661720, bgo#661855, bgo#628472, + bgo#663216, bgo#663671, bgo#663663, bgo#663802, bgo#664243, + bgo#664692, deb#642135, bgo#658140, bgo#658982, bgo#662551, + bgo#663712, bgo#304007, lp#262777 + + Updated translations. +- Replace pkgconfig(gtk+-2.0) BuildRequires with + pkgconfig(gtk+-3.0), following upstreams change to GTK 3. +- Add pkgconfig(librsvg-2.0) BuildRequires: A newly introduced + dependency to support SVG images. +- Add xz BuildRequires because we can't build a package for a + xz-compressed tarball without explicitly specifying that... See + bnc#697467 for more details. +- Drop pkgconfig(gconf-2.0) BuildRequires: with the move to + GSettings this is no longer needed. +- Remove gconf schema handling macros: gconf is no longer used. +- Clean spec-file using spec-cleaner. +- Remove explicit Requires from the -devel package: they are added + automatically the pkgconfig()-way. + ------------------------------------------------------------------- Tue Oct 25 18:24:25 UTC 2011 - vuntz@opensuse.org diff --git a/gnumeric.spec b/gnumeric.spec index 61cbebe..16dec01 100644 --- a/gnumeric.spec +++ b/gnumeric.spec @@ -1,7 +1,7 @@ # # spec file for package gnumeric # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,21 +15,17 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: gnumeric -Version: 1.10.17 -Release: 1 +Version: 1.11.1 +Release: 0 Summary: Spreadsheet Application License: GPL-2.0+ -Url: http://www.gnumeric.org/ Group: Productivity/Office/Spreadsheets -Source0: http://download.gnome.org/sources/gnumeric/1.10/%{name}-%{version}.tar.bz2 +Url: http://www.gnumeric.org/ +Source0: http://download.gnome.org/sources/gnumeric/1.11/%{name}-%{version}.tar.xz BuildRequires: fdupes -BuildRequires: gconf2-devel BuildRequires: goffice-devel -BuildRequires: gtk2-devel BuildRequires: intltool BuildRequires: libgda-devel BuildRequires: libgsf-devel @@ -39,14 +35,18 @@ BuildRequires: python-gobject2-devel BuildRequires: scrollkeeper BuildRequires: translation-update-upstream BuildRequires: update-desktop-files +# Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467 +BuildRequires: xz +#BuildRequires: pkgconfig(gconf-2.0) +BuildRequires: pkgconfig(gtk+-3.0) Recommends: %{name}-lang -Recommends: liberation-fonts ghostscript-fonts-std +Recommends: ghostscript-fonts-std +Recommends: liberation-fonts # For perl-func plugin Recommends: perl Provides: gnumeric2 = %{version} Obsoletes: gnumeric2 < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build -%gconf_schemas_prereq %description Gnumeric is a spreadsheet application with advanced features and @@ -67,10 +67,9 @@ needs. Gnumeric is part of the GNOME project. %package devel -License: GPL-2.0+ Summary: Spreadsheet Application Group: Productivity/Office/Spreadsheets -Requires: %{name} = %{version} glib2-devel goffice-devel gtk2-devel libglade2-devel libgsf-devel libxml2-devel +Requires: %{name} = %{version} %description devel Gnumeric is a spreadsheet application with advanced features and @@ -105,30 +104,27 @@ for LNG in po/*.po ; do done %build -export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" +export CFLAGS="%{optflags} -fno-strict-aliasing" %configure\ --disable-scrollkeeper\ --disable-static\ --enable-ssindex # --enable-pdfdocs -make %{?jobs:-j%jobs} +make %{?_smp_mflags} %install -%makeinstall +%make_install # FIXME: Build as root modifies system! -# gnumeric-1.6.3: --disable-scrollkeeper does not work properly. -rm -rf $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper +# gnumeric-1.6.3: --disable-scrollkeeper does not work properly. +rm -rf %{buildroot}%{_localstatedir}/scrollkeeper %suse_update_desktop_file -r -N Gnumeric %{name} Office Spreadsheet GNOME GTK %find_lang %{name} %{?no_lang_C} %find_lang gnumeric-functions %{?no_lang_C} %{name}.lang -%find_gconf_schemas -find %{buildroot} -type f -name "*.la" -exec %{__rm} -fv {} + -%fdupes $RPM_BUILD_ROOT +find %{buildroot} -type f -name "*.la" -delete -print +%fdupes %{buildroot} %clean -rm -rf $RPM_BUILD_ROOT - -%pre -f %{name}.schemas_pre +rm -rf %{buildroot} %post /sbin/ldconfig @@ -138,10 +134,6 @@ rm -rf $RPM_BUILD_ROOT %icon_theme_cache_post %endif -%posttrans -f %{name}.schemas_posttrans - -%preun -f %{name}.schemas_preun - %postun /sbin/ldconfig %if 0%{?suse_version} > 1130 @@ -150,7 +142,7 @@ rm -rf $RPM_BUILD_ROOT %icon_theme_cache_postun %endif -%files -f %{name}.schemas_list +%files %defattr(-, root, root) %doc AUTHORS BEVERAGES BUGS COPYING HACKING MAINTAINERS NEWS README ChangeLog OChangeLog* %dir %{_datadir}/gnome/ @@ -171,7 +163,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/gnumeric/*/plugins/*/*.py %{_libdir}/gnumeric/*/plugins/*/*.pl %{_libdir}/gnumeric/*/plugins/gnome-glossary/glossary-po-header -%{_libdir}/goffice/*/plugins/gnumeric +%{_libdir}/goffice/ %{_datadir}/applications/*.desktop %{_datadir}/glib-2.0/schemas/org.gnome.gnumeric.dialogs.gschema.xml %{_datadir}/glib-2.0/schemas/org.gnome.gnumeric.gschema.xml From f7e13d59c7de518c74ddfe5ddc2f02789442325accf2fb47612e834826fd78bb Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 20 Jan 2012 09:13:00 +0000 Subject: [PATCH 3/3] Accepting request 100668 from home:vuntz:branches:GNOME:Apps Small cleanup OBS-URL: https://build.opensuse.org/request/show/100668 OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/gnumeric?expand=0&rev=56 --- gnumeric.changes | 62 +++++++++++++++++++++++++++--------------------- gnumeric.spec | 18 +++++++------- 2 files changed, 45 insertions(+), 35 deletions(-) diff --git a/gnumeric.changes b/gnumeric.changes index 90e128b..ed399ad 100644 --- a/gnumeric.changes +++ b/gnumeric.changes @@ -1,48 +1,56 @@ +------------------------------------------------------------------- +Thu Jan 19 07:56:17 UTC 2012 - vuntz@opensuse.org + +- Add explicit pkgconfig() BuildRequires: glib-2.0, pango, + pangocairo. Those were all implicitly brought in before. +- Change goffice-devel BuildRequires to pkgconfig(libgoffice-0.10), + to avoid any confusion between goffice-0_8 and goffice. +- Stop changing Name of gnumeric.desktop: it's already fine + upstream. + ------------------------------------------------------------------- Mon Jan 9 16:37:21 UTC 2012 - dimstar@opensuse.org - Update to version 1.11.1: - + Make things build against gtk+-3.0. - + Add support for SVG images using librsvg. + Show range selection cursors even while selecting new regions and on other sheets + Fixed expression range cursor behavior [bgo#664852] + Build fixes relating to embedded ui files [bgo#664828] - Changes from version 1.11.0: + + Highlights: + - Gnumeric uses GTK+ 3, not GTK+ 2. + - Gnumeric uses GTK+'s ui manager files, not libglade. + - Gnumeric uses GSettings, not GConf. + - Lots of small bug fixes. + + Various fixes for xls, xlsx and ODF compatibility. + + Add support for SVG images. + Clarify the distinction beween open/save and import/export. - + Fully read scientific format from ODF. - + Provide progress feedback when generating random numbers. + Add HPFILTER function calculating the Hodrick Prescott Filter. + Enable markup selection in scientific format selector. - + Be compatible with the changed LibreOffice ODF documents with - tab colours. - + Some more number formatting improvements to ODF import/export. - + Read and write tick spacing from/to ODF files. + Fix IRR and other functions acting on paired data set when called with fixed arrays. - + Bugs fixed: bgo#662412, bgo#662413, bgo#584380, bgo#651561, - bgo#655877, bgo#535473, bgo#656799, bgo#634803, bgo#356711, - bgo#657506, bgo#658223, bgo#658916, bgo#660242, bgo#658981, - bgo#660248, bgo#660657, bgo#660605, bgo#661958, bgo#662056, - bgo#662056, bgo#662310, bgo#662331, bgo#662361, bgo#662149, - bgo#425685, bgo#662472, bgo#663078, bgo#627509, bgo#663135, - bgo#603533, bgo#662474, bgo#663117, bgo#661405, bgo#455712, - bgo#664351, bgo#664447, bgo#664754, bgo#645673, bgo#656418, - bgo#645842, bgo#658194, bgo#658639, bgo#657036, bgo#659246, - bgo#660241, bgo#661213, bgo#661720, bgo#661855, bgo#628472, - bgo#663216, bgo#663671, bgo#663663, bgo#663802, bgo#664243, - bgo#664692, deb#642135, bgo#658140, bgo#658982, bgo#662551, - bgo#663712, bgo#304007, lp#262777 + + Remove obsolete Hildon port and obsolete code. + + Bugs fixed: bgo#304007, bgo#356711, bgo#425685, bgo#455712, + bgo#535473, bgo#584380, bgo#603533, bgo#627509, bgo#628472, + bgo#634803, bgo#645673, bgo#645842, bgo#651561, bgo#655877, + bgo#656418, bgo#656799, bgo#657036, bgo#657506, bgo#658140, + bgo#658194, bgo#658223, bgo#658639, bgo#658916, bgo#658981, + bgo#658982, bgo#659246, bgo#660241, bgo#660242, bgo#660248, + bgo#660605, bgo#660657, bgo#661213, bgo#661405, bgo#661720, + bgo#661855, bgo#661958, bgo#662056, bgo#662056, bgo#662149, + bgo#662310, bgo#662331, bgo#662361, bgo#662412, bgo#662413, + bgo#662472, bgo#662474, bgo#662551, bgo#663078, bgo#663117, + bgo#663135, bgo#663216, bgo#663663, bgo#663671, bgo#663712, + bgo#663802, bgo#664243, bgo#664351, bgo#664447, bgo#664692, + bgo#664754, deb#642135, lp#262777. + Updated translations. -- Replace pkgconfig(gtk+-2.0) BuildRequires with - pkgconfig(gtk+-3.0), following upstreams change to GTK 3. -- Add pkgconfig(librsvg-2.0) BuildRequires: A newly introduced - dependency to support SVG images. - Add xz BuildRequires because we can't build a package for a xz-compressed tarball without explicitly specifying that... See bnc#697467 for more details. -- Drop pkgconfig(gconf-2.0) BuildRequires: with the move to - GSettings this is no longer needed. +- Replace gtk2-devel BuildRequires with pkgconfig(gtk+-3.0), + following upstreams change to GTK 3. +- Drop gconf2-devel BuildRequires: with the move to GSettings this + is no longer needed. - Remove gconf schema handling macros: gconf is no longer used. - Clean spec-file using spec-cleaner. - Remove explicit Requires from the -devel package: they are added diff --git a/gnumeric.spec b/gnumeric.spec index 16dec01..41a6ed0 100644 --- a/gnumeric.spec +++ b/gnumeric.spec @@ -25,7 +25,6 @@ Group: Productivity/Office/Spreadsheets Url: http://www.gnumeric.org/ Source0: http://download.gnome.org/sources/gnumeric/1.11/%{name}-%{version}.tar.xz BuildRequires: fdupes -BuildRequires: goffice-devel BuildRequires: intltool BuildRequires: libgda-devel BuildRequires: libgsf-devel @@ -37,8 +36,11 @@ BuildRequires: translation-update-upstream BuildRequires: update-desktop-files # Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467 BuildRequires: xz -#BuildRequires: pkgconfig(gconf-2.0) -BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(glib-2.0) >= 2.28.0 +BuildRequires: pkgconfig(gtk+-3.0) >= 3.0.0 +BuildRequires: pkgconfig(libgoffice-0.10) >= 0.9.1 +BuildRequires: pkgconfig(pango) >= 1.24.0 +BuildRequires: pkgconfig(pangocairo) >= 1.24.0 Recommends: %{name}-lang Recommends: ghostscript-fonts-std Recommends: liberation-fonts @@ -116,8 +118,8 @@ make %{?_smp_mflags} %make_install # FIXME: Build as root modifies system! # gnumeric-1.6.3: --disable-scrollkeeper does not work properly. -rm -rf %{buildroot}%{_localstatedir}/scrollkeeper -%suse_update_desktop_file -r -N Gnumeric %{name} Office Spreadsheet GNOME GTK +rm -r %{buildroot}%{_localstatedir}/scrollkeeper +%suse_update_desktop_file -r %{name} Office Spreadsheet GNOME GTK %find_lang %{name} %{?no_lang_C} %find_lang gnumeric-functions %{?no_lang_C} %{name}.lang find %{buildroot} -type f -name "*.la" -delete -print @@ -163,15 +165,15 @@ rm -rf %{buildroot} %{_libdir}/gnumeric/*/plugins/*/*.py %{_libdir}/gnumeric/*/plugins/*/*.pl %{_libdir}/gnumeric/*/plugins/gnome-glossary/glossary-po-header -%{_libdir}/goffice/ -%{_datadir}/applications/*.desktop +%{_libdir}/goffice/*/plugins/gnumeric/ +%{_datadir}/applications/gnumeric.desktop %{_datadir}/glib-2.0/schemas/org.gnome.gnumeric.dialogs.gschema.xml %{_datadir}/glib-2.0/schemas/org.gnome.gnumeric.gschema.xml %{_datadir}/glib-2.0/schemas/org.gnome.gnumeric.plugin.gschema.xml %{_datadir}/gnumeric/ %{_datadir}/icons/hicolor/*/apps/gnumeric.* %{_datadir}/pixmaps/*.png -%{_datadir}/pixmaps/*.ico +%{_datadir}/pixmaps/win32-gnumeric.ico %{_datadir}/pixmaps/gnumeric/ %{_mandir}/man?/*.*