- BR: s/libmpfr-devel/mpfr-devel/

- removed obsolete GNOME mime-info stuff
- used rpm macros
- added link patch, release 2

Changed files:
    genius.spec -> 1.63

diff --git a/genius.spec b/genius.spec
index 965355f0c362d1fc7435f018ae25d7fb3d96341d..fd16087309104847de4574a14e058c054d5c0f29 100644 (file)
--- a/genius.spec
+++ b/genius.spec
@@ -2,13 +2,14 @@ Summary:      General tool for mathematics
 Summary(pl):   Rozbudowane narzêdzie matematyczne
 Name:          genius
 Version:       0.7.7
-Release:       1
+Release:       2
 License:       GPL v2+
 Group:         X11/Applications
 Source0:       http://ftp.gnome.org/pub/gnome/sources/genius/0.7/%{name}-%{version}.tar.bz2
 # Source0-md5: 8c8bfdfb17e6e54eba283e813cfddeca
 Patch0:                %{name}-termcap.patch
 Patch1:                %{name}-desktop.patch
+Patch2:                %{name}-link.patch
 URL:           http://www.jirka.org/genius.html
 BuildRequires: autoconf
 BuildRequires: automake
@@ -20,14 +21,16 @@ BuildRequires:      gtksourceview-devel >= 0.3.0
 BuildRequires: intltool >= 0.21
 BuildRequires: libglade2-devel >= 2.0.1
 BuildRequires: libgnomeui-devel >= 2.4.0
-BuildRequires: libmpfr-devel >= 2.2.0
+BuildRequires: mpfr-devel >= 2.2.0
 BuildRequires: libtool
 BuildRequires: ncurses-devel
 BuildRequires: pkgconfig
 BuildRequires: readline-devel
-BuildRequires: rpmbuild(macros) >= 1.198
+BuildRequires: rpmbuild(macros) >= 1.311
 BuildRequires: scrollkeeper
 BuildRequires: vte-devel >= 0.8.19
+Requires(post,postun): gtk+2
+Requires(post,postun): hicolor-icon-theme
 Requires(post,postun): scrollkeeper
 Requires(post,postun): shared-mime-info
 Obsoletes:     drgenius
@@ -64,14 +67,15 @@ Pliki nag
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 rm -f missing acinclude.m4
 gnome-doc-common
 cp xmldocs.make help
 %{__libtoolize}
-glib-gettextize --copy --force
-intltoolize --copy --force
+%{__glib_gettextize}
+%{__intltoolize}
 %{__aclocal}
 %{__autoconf}
 %{__autoheader}
@@ -90,7 +94,11 @@ rm -rf $RPM_BUILD_ROOT
        DESTDIR=$RPM_BUILD_ROOT
 
 # Thess files are autogenerated
-rm -f $RPM_BUILD_ROOT%{_datadir}/mime/{XMLnamespaces,globs,magic}
+rm -f $RPM_BUILD_ROOT%{_datadir}/mime/{XMLnamespaces,aliases,globs,magic,mime.cache,subclasses}
+rm -rf $RPM_BUILD_ROOT%{_datadir}/mime/text
+
+# Obsoleted GNOME mime-info stuff
+rm -rf $RPM_BUILD_ROOT%{_datadir}/{application-registry,mime-info}
 
 %find_lang %{name} --with-gnome --all-name
 
@@ -99,25 +107,25 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 %scrollkeeper_update_post
-update-mime-database %{_datadir}/mime ||:
+%update_mime_database
+%update_icon_cache hicolor
 
 %postun
+%update_icon_cache hicolor
 %scrollkeeper_update_postun
-update-mime-database %{_datadir}/mime
+%update_mime_database
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README TODO
-%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %dir %{_libdir}/genius
+%attr(755,root,root) %{_bindir}/genius
+%attr(755,root,root) %{_bindir}/gnome-genius
+%dir %{_libdir}/genius
 %attr(755,root,root) %{_libdir}/genius-readline-helper-fifo
 %{_datadir}/genius
-%{_datadir}/application-registry/*
-%{_datadir}/mime-info/*
-%{_datadir}/mime/packages/*
-%{_datadir}/mime/text/*
-%{_desktopdir}/*.desktop
-%{_iconsdir}/*/*/apps/*.png
+%{_datadir}/mime/packages/genius.xml
+%{_desktopdir}/gnome-genius.desktop
+%{_iconsdir}/hicolor/*/apps/gnome-genius.png
 %{_omf_dest_dir}/%{name}
 
 %files devel