X-Git-Url: http://git.pld-linux.org/?p=packages%2Fgenius.git;a=blobdiff_plain;f=genius.spec;h=f000b4286487bdec5e7725807f2b577dcd9986d1;hp=2ebdf28c76595c7aa0aa15ee7f95ef957443de1d;hb=7f69a61f2a50666446d9521314e05f945d23fb3b;hpb=eaaae3e8c948b74d90c834e7b2ad7eea488ef6cb

diff --git a/genius.spec b/genius.spec
index 2ebdf28..f000b42 100644
--- a/genius.spec
+++ b/genius.spec
@@ -1,30 +1,46 @@
+# TODO: where is "euclidian geometry tool"? Maybe drgeo-obsolotes is false
 Summary:	General tool for mathematics
-Summary(pl):	Rozbudowane narzêdzie matematyczne
+Summary(pl.UTF-8):	Rozbudowane narzędzie matematyczne
 Name:		genius
-Version:	0.7.0
-Release:	1
-License:	GPL
-Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/gnome/sources/%{name}/0.7/%{name}-%{version}.tar.bz2
-# Source0-md5:	95de70b99cedebef73a90123de84647e
-Patch0:		%{name}-am.patch
-Patch1:		%{name}-termcap.patch
-Patch2:		%{name}-locale-names.patch
+Version:	1.0.12
+Release:	2
+License:	GPL v3+
+Group:		Applications/Math
+Source0:	http://ftp.5z.com/pub/genius/%{name}-%{version}.tar.bz2
+# Source0-md5:	12936d03d0d8f41ca747269d144632b2
+Patch0:		%{name}-termcap.patch
+Patch1:		%{name}-desktop.patch
+URL:		http://www.jirka.org/genius.html
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	bison
 BuildRequires:	flex
+BuildRequires:	gettext-devel
 BuildRequires:	gmp-devel
-BuildRequires:	gtksourceview-devel >= 0.3.0
+BuildRequires:	gnome-common >= 2.8.0-2
+BuildRequires:	gnome-vfs2-devel
+BuildRequires:	gtk+2-devel >= 2:2.12.0
+BuildRequires:	gtksourceview2-devel >= 2.0.2
 BuildRequires:	intltool >= 0.21
-BuildRequires:	libglade2-devel >= 2.0.1
-BuildRequires:	libgnomeui-devel >= 2.4.0
 BuildRequires:	libtool
+BuildRequires:	mpfr-devel >= 2.2.0
 BuildRequires:	ncurses-devel
-BuildRequires:	popt-devel
+BuildRequires:	pkgconfig
+BuildRequires:	readline-devel
+BuildRequires:	rpmbuild(find_lang) >= 1.23
+BuildRequires:	rpmbuild(macros) >= 1.311
+BuildRequires:	scrollkeeper
+BuildRequires:	sed >= 4.0
 BuildRequires:	vte-devel >= 0.8.19
-Requires(post,postun):	/sbin/ldconfig
+Requires(post,postun):	desktop-file-utils
+Requires(post,postun):	gtk-update-icon-cache
+Requires(post,postun):	hicolor-icon-theme
+Requires(post,postun):	scrollkeeper
 Requires(post,postun):	shared-mime-info
+Obsoletes:	drgenius
+Obsoletes:	drgeo
+# sr@Latn vs. sr@latin
+Conflicts:	glibc-misc < 6:2.7
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -34,47 +50,52 @@ programming language and evaluator, an euclidian geometry tool, a
 calculator handles multiple precision floating point numbers, infinite
 precision integers, complex numbers and matrixes.
 
-%description -l pl
-Genius to narzêdzie do rozwi±zywania problemów matematycznych.
-Zawiera ono matematyczny jêzyk programowania, narzêdzie do geometrii
-euklidesowej, narzêdzie do generowania wykresów 2D/3D oraz konsolowy
-kalkulator. Kalkulator obs³uguje liczby zmiennoprzecinkowe wysokiej
-precyzji, liczby ca³kowite, zespolone oraz macierze.
+%description -l pl.UTF-8
+Genius to narzędzie do rozwiązywania problemów matematycznych. Zawiera
+ono matematyczny język programowania, narzędzie do geometrii
+euklidesowej, narzędzie do generowania wykresów 2D/3D oraz konsolowy
+kalkulator. Kalkulator obsługuje liczby zmiennoprzecinkowe wysokiej
+precyzji, liczby całkowite, zespolone oraz macierze.
 
 %package devel
 Summary:	genius header files
-Summary(pl):	Pliki nag³ówkowe genius
+Summary(pl.UTF-8):	Pliki nagłówkowe genius
 Group:		X11/Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 
 %description devel
 Genius header files.
 
-%description devel -l pl
-Pliki nag³ówkowe genius.
+%description devel -l pl.UTF-8
+Pliki nagłówkowe genius.
 
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
-mv po/{no,nb}.po
+%{__sed} -i -e 's#sr\@Latn#sr\@latin#' configure.in
+%{__sed} -i 's@AM_BINRELOC@#AM_BINRELOC@' configure.in
+mv po/sr\@{Latn,latin}.po
 
 %build
-rm -f missing acinclude.m4
+rm -f acinclude.m4
+%{__gnome_doc_common}
+cp xmldocs.make help
 %{__libtoolize}
-glib-gettextize --copy --force
-intltoolize --copy --force
+%{__glib_gettextize}
+%{__intltoolize}
 %{__aclocal}
 %{__autoconf}
+%{__autoheader}
 %{__automake}
 %configure \
 	--disable-static \
 	--enable-gtksourceview \
-	--enable-gnome
+	--enable-gnome \
+	--disable-update-mimedb
 
-%{__make}
+%{__make} -j1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -82,40 +103,39 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+# Obsoleted GNOME mime-info stuff
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/{application-registry,mime-info}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/genius/libtestplugin.{so,la}
 
-# This files are autogenerated
-rm -f $RPM_BUILD_ROOT%{_datadir}/mime/{XMLnamespaces,globs,magic}
+%find_lang %{name} --with-gnome --with-omf --all-name
 
-%find_lang %{name} --with-gnome --all-name
+%clean
+rm -rf $RPM_BUILD_ROOT
 
 %post
-/sbin/ldconfig
-update-mime-database %{_datadir}/mime
+%scrollkeeper_update_post
+%update_desktop_database_post
+%update_mime_database
+%update_icon_cache hicolor
 
 %postun
-/sbin/ldconfig
-update-mime-database %{_datadir}/mime
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+%update_icon_cache hicolor
+%scrollkeeper_update_postun
+%update_desktop_database_postun
+%update_mime_database
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS NEWS README TODO
-%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %dir %{_libdir}/genius
-%attr(755,root,root) %{_libdir}/genius/libtestplugin.so.*.*.*
+%doc AUTHORS ChangeLog NEWS README TODO
+%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
+%{_datadir}/mime/packages/genius.xml
+%{_desktopdir}/gnome-genius.desktop
+%{_iconsdir}/hicolor/*/apps/*.png
 
 %files devel
 %defattr(644,root,root,755)
-# Do we really need this la and so files?
-%{_libdir}/genius/libtestplugin.so
-%{_libdir}/genius/libtestplugin.la
 %{_includedir}/genius