X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=Guppi.spec;h=f5cfb03b8c79a57179b94048d2be948149f5d788;hb=51452c23ee91877def384ef8372b6a056f09ff52;hp=5c4e79a74f6566e71faa1f2c9f7d049f1ec27e02;hpb=31fa352da2f8ba097904e095a21551b4a2c25ec8;p=packages%2FGuppi.git

diff --git a/Guppi.spec b/Guppi.spec
index 5c4e79a..f5cfb03 100644
--- a/Guppi.spec
+++ b/Guppi.spec
@@ -1,38 +1,51 @@
 Summary:	Guppi - GNOME Plotting Engine
 Name:		Guppi
-Version:	0.34.4
+Version:	0.35.5
 Release:	1
 License:	GPL
-Group:		X11/GNOME/Applications
-Group(pl):	X11/GNOME/Aplikacje
-Source0:	ftp://ftp.gnome.org/pub/guppi/%{name}-%{version}.tar.gz
-Patch0:		Guppi-DESTDIR.patch
+Group:		X11/Applications
+Group(de):	X11/Applikationen
+Group(pl):	X11/Aplikacje
+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:	gnome-print-devel >= 0.13.0
-BuildRequires:	ncurses-devel >= 5.0
-BuildRequires:	readline-devel >= 4.1
-BuildRequires:	gnome-libs-devel
 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.28
 BuildRequires:	gtk+-devel > 1.2.0
+BuildRequires:	guile-devel
 BuildRequires:	libglade-devel
 BuildRequires:	libxml-devel
-BuildRequires:	guile-devel
+BuildRequires:	libtool
+BuildRequires:	ncurses-devel >= 5.2
+BuildRequires:	python-devel
+BuildRequires:	readline-devel >= 4.2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Requires:	guile >= 1.3.4
+Obsoletes:	Guppi-static
 
 %define		_prefix		/usr/X11R6
 %define		_mandir		%{_prefix}/man
 
 %description
-Guppi is an easy-to-use graphical interface for plotting data and performing
-statistical manipulations.
+Guppi is an easy-to-use graphical interface for plotting data and
+performing statistical manipulations.
 
 %package devel
 Summary:	Guppi libraries, includes, etc
 Summary(pl):	Guppi - pliki nag³ówkowe, etc
-Group:		X11/GNOME/Development/Libraries
-Group(pl):	X11/GNOME/Programowanie/Biblioteki
+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.
@@ -43,8 +56,9 @@ Pliki nag
 %package static
 Summary:	Guppi static libraries
 Summary(pl):	Biblioteki statyczne Guppi
-Group:		X11/GNOME/Development/Libraries
-Group(pl):	X11/GNOME/Programowanie/Biblioteki
+Group:		X11/Development/Libraries
+Group(de):	X11/Entwicklung/Libraries
+Group(pl):	X11/Programowanie/Biblioteki
 Requires:	%{name}-devel = %{version}
 
 %description static
@@ -52,27 +66,29 @@ Guppi static libraries.
 
 %prep
 %setup -q
-%patch -p1
+%patch0 -p1
+%patch1 -p1
 
 %build
-automake
-LDFLAGS="-s"; export LDFLAGS
+libtoolize --copy --force
+gettextize --copy --force
+aclocal -I macros
+autoconf
+automake -a -c -i
 %configure
-make
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install \
+%{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
-	appdir=%{_applnkdir}/Graphics
-
-strip --strip-unneede $RPM_BUILD_ROOT%{_libdir}/lib*.so.*.* \
-	$RPM_BUILD_ROOT%{_libdir}/guppi/plug-ins/%{version}/lib*.so.*.*
+	appdir=%{_applnkdir}/Graphics \
+	aclocaldir=%{_aclocaldir}
 
 gzip -9nf AUTHORS BIBLIOGRAPHY ChangeLog NEWS README
 
-%find_lang %{name} --with-gnome
+%find_lang %{name} --with-gnome --all-name
 
 %post   -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -88,10 +104,16 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/guppi
 %dir %{_libdir}/guppi/plug-ins
 %dir %{_libdir}/guppi/plug-ins/%{version}
-%attr(755,root,root) %{_libdir}/guppi/plug-ins/%{version}/lib*.so*
+%dir %{_libdir}/guppi/plug-ins/%{version}/*
+%dir %{_libdir}/guppi/plug-ins/%{version}/*/*
+%{_libdir}/guppi/plug-ins/%{version}/*/*/*.plugin
+%{_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}/*/*/*.so*
 
 %{_datadir}/guppi
-%{_datadir}/pixmaps/*
+%{_pixmapsdir}/*
 %{_applnkdir}/Graphics/*
 
 %files devel
@@ -99,8 +121,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}/*