X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=Guppi.spec;h=76483a745ca5acb7174e19d2f1c7f6197f139942;hb=2ed7f7268b1b501900f5ae8dd07d4299a1f1f390;hp=ec8589214ec97401366b06f032b5e10ef53be859;hpb=c5239de34cdb2459cfe2ee0948e2434668e04432;p=packages%2FGuppi.git

diff --git a/Guppi.spec b/Guppi.spec
index ec85892..76483a7 100644
--- a/Guppi.spec
+++ b/Guppi.spec
@@ -1,28 +1,36 @@
 Summary:	Guppi - GNOME Plotting Engine
 Name:		Guppi
-Version:	0.35.1
+Version:	0.35.5
 Release:	1
 License:	GPL
 Group:		X11/Applications
 Group(de):	X11/Applikationen
 Group(pl):	X11/Aplikacje
-Source0:	ftp://ftp.gnome.org/pub/guppi/%{name}-%{version}.tar.gz
+Source0:	ftp://ftp.gnome.org/pub/GNOME/stable/sources/Guppi/%{name}-%{version}.tar.bz2
 Patch0:		%{name}-DESTDIR.patch
+Patch1:		%{name}-use_AM_GNU_GETTEXT.patch
 URL:		http://www.gnome.org/guppi/
 BuildRequires:	ORBit-devel
+BuildRequires:	autoconf
+BuildRequires:	automake
+BuildRequires:	esound-devel
 BuildRequires:	flex
+BuildRequires:	gdk-pixbuf-devel >= 0.8.0
 BuildRequires:	gettext-devel
 BuildRequires:	gnome-libs-devel
-BuildRequires:	gnome-print-devel >= 0.13.0
+BuildRequires:	gnome-print-devel >= 0.28
 BuildRequires:	gtk+-devel > 1.2.0
 BuildRequires:	guile-devel
 BuildRequires:	libglade-devel
 BuildRequires:	libxml-devel
-BuildRequires:	ncurses-devel >= 5.0
+BuildRequires:	libtool
+BuildRequires:	ncurses-devel >= 5.2
 BuildRequires:	python-devel
-BuildRequires:	readline-devel >= 4.1
+BuildRequires:	readline-devel >= 4.2
+BuildRequires:	xml-i18n-tools
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Requires:	guile >= 1.3.4
+Obsoletes:	Guppi-static
 
 %define		_prefix		/usr/X11R6
 %define		_mandir		%{_prefix}/man
@@ -38,6 +46,7 @@ Group:		X11/Development/Libraries
 Group(de):	X11/Entwicklung/Libraries
 Group(pl):	X11/Programowanie/Biblioteki
 Requires:	%{name} = %{version}
+Obsoletes:	Guppi-static
 
 %description devel
 Header files for Guppi.
@@ -58,12 +67,18 @@ Guppi static libraries.
 
 %prep
 %setup -q
-%patch -p1
+%patch0 -p1
+%patch1 -p1
 
 %build
+libtoolize --copy --force
 gettextize --copy --force
-automake
-%configure
+aclocal -I macros
+autoconf
+automake -a -c -i
+
+%configure --enable-gnumeric
+
 %{__make}
 
 %install
@@ -71,7 +86,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
-	appdir=%{_applnkdir}/Graphics
+	appdir=%{_applnkdir}/Graphics \
+	aclocaldir=%{_aclocaldir}
 
 gzip -9nf AUTHORS BIBLIOGRAPHY ChangeLog NEWS README
 
@@ -97,10 +113,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/guppi/plug-ins/%{version}/*/*/*.scm
 %{_libdir}/guppi/plug-ins/%{version}/*/*/*.glade
 %{_libdir}/guppi/plug-ins/%{version}/*/*/*.png
-%attr(755,root,root) %{_libdir}/guppi/plug-ins/%{version}/*/*/lib*.so*
+%attr(755,root,root) %{_libdir}/guppi/plug-ins/%{version}/*/*/*.so*
 
 %{_datadir}/guppi
-%{_datadir}/pixmaps/*
+%{_pixmapsdir}/*
 %{_applnkdir}/Graphics/*
 
 %files devel
@@ -108,8 +124,4 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/lib*.so
 %attr(755,root,root) %{_libdir}/lib*.la
 %{_includedir}/*
-
-%files static
-%defattr(644,root,root,755)
-%{_libdir}/lib*.a
-%{_libdir}/guppi/plug-ins/%{version}/lib*.a
+%{_aclocaldir}/*