- updated to 0.40.3

[packages/Guppi.git] / Guppi.spec

diff --git a/Guppi.spec b/Guppi.spec
index 93ec9037b715ef88259b3ffed1213539c5f5c262..982530ca84d6025872fbe5941edcb9ea433c30f1 100644 (file)
--- a/Guppi.spec
+++ b/Guppi.spec
@@ -1,16 +1,17 @@
+%include       /usr/lib/rpm/macros.python
 Summary:       Guppi - GNOME Plotting Engine
 Summary(pl):   Guppi - Silnik Rysuj±cy GNOME
 Summary(pt_BR):        Analisador e visualizador de dados do GNOME
 Name:          Guppi
-Version:       0.40.0
+Version:       0.40.3
 Release:       1
 License:       GPL
 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}-use_AM_GNU_GETTEXT.patch
-Patch1:                %{name}-acfix.patch
+Patch0:                %{name}-am_ac.patch
+Source1:       %{name}.desktop
 URL:           http://www.gnome.org/guppi/
 BuildRequires: ORBit-devel
 BuildRequires: autoconf
@@ -23,19 +24,18 @@ BuildRequires:      gnome-libs-devel
 BuildRequires: gnome-print-devel >= 0.28
 BuildRequires: gtk+-devel > 1.2.0
 BuildRequires: guile-devel
+BuildRequires: intltool
 BuildRequires: libglade-devel
 BuildRequires: libxml-devel
 BuildRequires: libtool
 BuildRequires: ncurses-devel >= 5.2
 BuildRequires: python-devel >= 2.1
 BuildRequires: readline-devel >= 4.2
-BuildRequires: xml-i18n-tools
 BuildRequires: rpm-pythonprov
+BuildRequires: gnumeric >= 1.0.3
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Requires:      guile >= 1.3.4
-Obsoletes:     Guppi-static
-
-%include /usr/lib/rpm/macros.python
+Obsoletes:     libguppi15
 
 %define                _prefix         /usr/X11R6
 %define                _mandir         %{_prefix}/man
@@ -65,7 +65,8 @@ Group(pt_BR): X11/Desenvolvimento/Bibliotecas
 Group(ru):     X11/òÁÚÒÁÂÏÔËÁ/âÉÂÌÉÏÔÅËÉ
 Group(uk):     X11/òÏÚÒÏÂËÁ/â¦Â̦ÏÔÅËÉ
 Requires:      %{name} = %{version}
-Obsoletes:     Guppi-static
+Requires:      python-devel
+Obsoletes:     libguppi15-devel
 
 %description devel
 Header files for Guppi.
@@ -103,31 +104,38 @@ Bibliotecas est
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
+sed -e s/AM_GNOME_GETTEXT/AM_GNU_GETTEXT/ configure.in > configure.in.tmp
+mv -f configure.in.tmp configure.in
 rm -f missing
+xml-i18n-toolize --copy --force
 libtoolize --copy --force
 gettextize --copy --force
-aclocal -I macros
+aclocal -I %{_aclocaldir}/gnome
+autoheader
 autoconf
-automake -a -c -i
+automake -a -c
 
 CPPFLAGS="-I%{py_incdir}"; export CPPFLAGS
 
 %configure \
-       --enable-gnumeric
+       --enable-gnumeric \
+       
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{_applnkdir}/Graphics
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
        appdir=%{_applnkdir}/Graphics \
        aclocaldir=%{_aclocaldir}
 
+install %{SOURCE1} $RPM_BUILD_ROOT%{_applnkdir}/Graphics
+
 gzip -9nf AUTHORS BIBLIOGRAPHY ChangeLog NEWS README
 
 %find_lang %{name} --with-gnome --all-name
@@ -141,22 +149,20 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc *.gz
-%attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_libdir}/lib*.so.*.*
-%attr(755,root,root) %{_libdir}/libguppiConf.sh
+%attr(755,root,root) %{_bindir}/*
 %dir %{_libdir}/guppi
 %dir %{_libdir}/guppi/plug-ins
 %dir %{_libdir}/guppi/plug-ins/%{version}
 %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}/oaf
+%{_datadir}/oaf/*.oaf*
 %{_pixmapsdir}/*
 %{_applnkdir}/Graphics/*
 
@@ -164,5 +170,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/lib*.so
 %attr(755,root,root) %{_libdir}/lib*.la
-%{_includedir}/*
-%{_aclocaldir}/*
+%attr(755,root,root) %{_libdir}/libguppiConf.sh
+%{_includedir}/gnome-*/*
+%{_aclocaldir}/*.m4