packages: gnumeric/gnumeric.spec - libgda BRs updated to gda 4 - bcond disa...

sparky sparky at pld-linux.org
Thu Feb 18 15:10:46 CET 2010


Author: sparky                       Date: Thu Feb 18 14:10:46 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- libgda BRs updated to gda 4 - bcond disabled because required versions are
  experimental and we don't have them
- BR: perl-devel, rpm-perlprov
- dropped unused BR: docbook-utils, libgnomeprint-devel, libgnomeprintui-devel
- some adapterization

---- Files affected:
packages/gnumeric:
   gnumeric.spec (1.183 -> 1.184) 

---- Diffs:

================================================================
Index: packages/gnumeric/gnumeric.spec
diff -u packages/gnumeric/gnumeric.spec:1.183 packages/gnumeric/gnumeric.spec:1.184
--- packages/gnumeric/gnumeric.spec:1.183	Thu Feb 18 13:52:29 2010
+++ packages/gnumeric/gnumeric.spec	Thu Feb 18 15:10:41 2010
@@ -1,7 +1,7 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-%bcond_without	gda	# build without gda
+%bcond_with	gda	# build without gda
 %bcond_without	gnome	# build without gnome
 %bcond_without	python	# build without python support
 %bcond_with	mono	# build without mono scripting engine
@@ -34,7 +34,6 @@
 BuildRequires:	autoconf >= 2.52
 BuildRequires:	automake
 BuildRequires:	bison
-BuildRequires:	docbook-utils
 BuildRequires:	flex
 BuildRequires:	gettext-devel
 BuildRequires:	glib2-devel >= 1:2.12.0
@@ -48,12 +47,10 @@
 BuildRequires:	libgsf-gnome-devel >= 1.14.15
 %endif
 %if %{with gda}
-BuildRequires:	libgda3-devel >= 3.1.1
-BuildRequires:	libgnomedb3-devel >= 3.1.1
+BuildRequires:	libgda4-devel >= 4.1.1
+BuildRequires:	libgnomedb4-devel >= 3.99.6
 %endif
 BuildRequires:	libglade2-devel >= 1:2.6.0
-BuildRequires:	libgnomeprint-devel >= 2.12.0
-BuildRequires:	libgnomeprintui-devel >= 2.12.1
 %{?with_gnome:BuildRequires:	libgnomeui-devel >= 2.15.90}
 BuildRequires:	libgsf-devel >= 1.14.1
 BuildRequires:	libtool
@@ -62,21 +59,23 @@
 %{?with_mono:BuildRequires:	mono-devel >= 1.0.0}
 BuildRequires:	pango-devel >= 1:1.13.4
 BuildRequires:	perl-base
+BuildRequires:	perl-devel
 BuildRequires:	pkgconfig
 BuildRequires:	popt-devel
 BuildRequires:	psiconv-devel >= 0.9.3
 BuildRequires:	pxlib-devel
+BuildRequires:	rpm-perlprov
 %if %{with python}
 BuildRequires:	python-devel >= 2.2
 BuildRequires:	python-pygtk-devel >= 2:2.9.3
 %endif
 BuildRequires:	rpmbuild(macros) >= 1.213
 BuildRequires:	scrollkeeper
-Requires(post,preun):	GConf2 >= 2.14.0
 Requires(post,postun):	desktop-file-utils
 Requires(post,postun):	scrollkeeper
-Requires:	libspreadsheet = %{epoch}:%{version}-%{release}
+Requires(post,preun):	GConf2 >= 2.14.0
 %{?with_gnome:Requires:	libgnomeui >= 2.15.1}
+Requires:	libspreadsheet = %{epoch}:%{version}-%{release}
 # sr at Latn vs. sr at latin
 Conflicts:	glibc-misc < 6:2.7
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -131,7 +130,8 @@
 Requires:	libspreadsheet = %{epoch}:%{version}-%{release}
 
 %description -n libspreadsheet-devel
-This is the package containing the header files for libspreadsheet library.
+This is the package containing the header files for libspreadsheet
+library.
 
 %description -n libspreadsheet-devel -l pl.UTF-8
 Ten pakiet zawiera pliki nagłówkowe biblioteki libspreadsheet.
@@ -141,7 +141,7 @@
 %package plugin-applix
 Summary:	Applix plugin
 Summary(pl.UTF-8):	Wtyczka Applix
-Group:		Applications/Productivity
+Group:		X11/Applications
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 
 %description plugin-applix
@@ -150,11 +150,11 @@
 %description plugin-applix -l pl.UTF-8
 Importuje arkusze Applix w wersjach 4.[234].
 
-# data interchange format (DIF) 
+# data interchange format (DIF)
 %package plugin-dif
 Summary:	Data Interchange Format plugin
 Summary(pl.UTF-8):	Wtyczka Data Interchange Format
-Group:		Applications/Productivity
+Group:		X11/Applications
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 
 %description plugin-dif
@@ -162,14 +162,14 @@
 (*.dif).
 
 %description plugin-dif -l pl.UTF-8
-Odczytuje i zapisuje informacje w uniwersalnym formacie wymiany
-danych (*.dif).
+Odczytuje i zapisuje informacje w uniwersalnym formacie wymiany danych
+(*.dif).
 
 # ms excel
 %package plugin-excel
 Summary:	MS Excel (tm) plugin
 Summary(pl.UTF-8):	Wtyczka MS Excel (tm)
-Group:		Applications/Productivity
+Group:		X11/Applications
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 
 %description plugin-excel
@@ -182,7 +182,7 @@
 %package plugin-glpk
 Summary:	GLPK plugin
 Summary(pl.UTF-8):	Wtyczka GLPK
-Group:		Applications/Productivity
+Group:		X11/Applications
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 
 %description plugin-glpk
@@ -195,7 +195,7 @@
 %package plugin-html
 Summary:	HTML plugin
 Summary(pl.UTF-8):	Wtyczka HTML
-Group:		Applications/Productivity
+Group:		X11/Applications
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 
 %description plugin-html
@@ -208,7 +208,7 @@
 %package plugin-lotus123
 Summary:	Lotus 123 plugin
 Summary(pl.UTF-8):	Wtyczka Lotus 123
-Group:		Applications/Productivity
+Group:		X11/Applications
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 
 %description plugin-lotus123
@@ -221,7 +221,7 @@
 %package plugin-lpsolve
 Summary:	lpsolve plugin
 Summary(pl.UTF-8):	Wtyczka lpsolve
-Group:		Applications/Productivity
+Group:		X11/Applications
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 
 %description plugin-lpsolve
@@ -234,7 +234,7 @@
 %package plugin-gnuoleo
 Summary:	GNU Oleo plugin
 Summary(pl.UTF-8):	Wtyczka GNU Oleo
-Group:		Applications/Productivity
+Group:		X11/Applications
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 
 %description plugin-gnuoleo
@@ -247,7 +247,7 @@
 %package plugin-openoffice
 Summary:	OpenOffice.org plugin
 Summary(pl.UTF-8):	Wtyczka OpenOffice.org
-Group:		Applications/Productivity
+Group:		X11/Applications
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 
 %description plugin-openoffice
@@ -260,7 +260,7 @@
 %package plugin-paradox
 Summary:	Paradox plugin
 Summary(pl.UTF-8):	Wtyczka Paradox
-Group:		Applications/Productivity
+Group:		X11/Applications
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 
 %description plugin-paradox
@@ -273,7 +273,7 @@
 %package plugin-planperfect
 Summary:	Plan Perfect plugin
 Summary(pl.UTF-8):	Wtyczka Plan Perfect
-Group:		Applications/Productivity
+Group:		X11/Applications
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 
 %description plugin-planperfect
@@ -286,7 +286,7 @@
 %package plugin-psiconv
 Summary:	Psiconv plugin
 Summary(pl.UTF-8):	Wtyczka Psiconv
-Group:		Applications/Productivity
+Group:		X11/Applications
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 
 %description plugin-psiconv
@@ -299,7 +299,7 @@
 %package plugin-qpro
 Summary:	Quattro Pro(tm) plugin
 Summary(pl.UTF-8):	Wtyczka Quattro Pro(tm)
-Group:		Applications/Productivity
+Group:		X11/Applications
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 
 %description plugin-qpro
@@ -312,7 +312,7 @@
 %package plugin-sc
 Summary:	SC/XSpread plugin
 Summary(pl.UTF-8):	Wtyczka SC/XSpread
-Group:		Applications/Productivity
+Group:		X11/Applications
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 
 %description plugin-sc
@@ -325,7 +325,7 @@
 %package plugin-sylk
 Summary:	MultiPlan (SYLK) plugin
 Summary(pl.UTF-8):	Wtyczka MultiPlan (SYLK)
-Group:		Applications/Productivity
+Group:		X11/Applications
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 
 %description plugin-sylk
@@ -338,7 +338,7 @@
 %package plugin-xbase
 Summary:	XBase plugin
 Summary(pl.UTF-8):	Wtyczka Xbase
-Group:		Applications/Productivity
+Group:		X11/Applications
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 
 %description plugin-xbase
@@ -352,7 +352,7 @@
 %package plugin-gdaif
 Summary:	Database plugin
 Summary(pl.UTF-8):	Wtyczka baz danych
-Group:		Applications/Productivity
+Group:		X11/Applications
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 
 %description plugin-gdaif
@@ -365,7 +365,7 @@
 %package plugin-gnomedb
 Summary:	GNOME DB plugin
 Summary(pl.UTF-8):	Wtyczka GNOME DB
-Group:		Applications/Productivity
+Group:		X11/Applications
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 Requires:	gnumeric-plugin-gdaif
 
@@ -379,7 +379,7 @@
 %package plugin-sample
 Summary:	Sample plugins
 Summary(pl.UTF-8):	Przykładowe wtyczki
-Group:		Applications/Productivity
+Group:		X11/Applications
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 
 %description plugin-sample
@@ -393,7 +393,7 @@
 %package plugin-perl
 Summary:	Perl plugin
 Summary(pl.UTF-8):	Wtyczk Perla
-Group:		Applications/Productivity
+Group:		X11/Applications
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 
 %description plugin-perl
@@ -407,7 +407,7 @@
 %package plugin-python
 Summary:	Python plugin
 Summary(pl.UTF-8):	Wtyczk Pythona
-Group:		Applications/Productivity
+Group:		X11/Applications
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 Requires:	python-modules
 Requires:	python-pygtk-gtk
@@ -450,7 +450,7 @@
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
-	docdir=/usr/share/gnome/help/gnumeric/C \
+	docdir=%{_datadir}/gnome/help/gnumeric/C \
 	GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/gnumeric/%{version}/plugins/*/*.la
@@ -545,7 +545,7 @@
 %attr(755,root,root) %{_libdir}/gnumeric/%{version}/plugins/applix/*.so
 %{_libdir}/gnumeric/%{version}/plugins/applix/*.xml
 
-# data interchange format (DIF) 
+# data interchange format (DIF)
 %files plugin-dif
 %defattr(644,root,root,755)
 %dir %{_libdir}/gnumeric/%{version}/plugins/dif
@@ -704,6 +704,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.184  2010/02/18 14:10:41  sparky
+- libgda BRs updated to gda 4 - bcond disabled because required versions are
+  experimental and we don't have them
+- BR: perl-devel, rpm-perlprov
+- dropped unused BR: docbook-utils, libgnomeprint-devel, libgnomeprintui-devel
+- some adapterization
+
 Revision 1.183  2010/02/18 12:52:29  lisu
 - GPL v2+ license
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gnumeric/gnumeric.spec?r1=1.183&r2=1.184&f=u



More information about the pld-cvs-commit mailing list