X-Git-Url: http://git.pld-linux.org/?p=packages%2Fgenius.git;a=blobdiff_plain;f=genius.spec;h=643bd4b9166f2bc7c116366fde3370c4876075df;hp=f5d29a1ea67df6153f076490f078b7a8777aed5f;hb=5dcbbb8157c93a3e89c9b2850af82f2cbdd01902;hpb=245f61099cacc0b327142a62492bae732af0637b

diff --git a/genius.spec b/genius.spec
index f5d29a1..643bd4b 100644
--- a/genius.spec
+++ b/genius.spec
@@ -1,17 +1,16 @@
 Summary:	General tool for mathematics
-Summary(pl):	Rozbudowane narzêdzie matematyczne
+Summary(pl.UTF-8):	Rozbudowane narzędzie matematyczne
 Name:		genius
-Version:	0.7.2
-Release:	1
-License:	GPL
+Version:	1.0.0
+Release:	2
+License:	GPL v3+
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/gnome/sources/%{name}/0.7/%{name}-%{version}.tar.bz2
-# Source0-md5:	69944ec93ad62cc4c3dc4ba35d4c2944
-Patch0:		%{name}-am.patch
-Patch1:		%{name}-termcap.patch
-Patch2:		%{name}-locale-names.patch
-Patch3:		%{name}-desktop.patch
-Patch4:		%{name}-term_mpfr_fix.patch
+Source0:	http://ftp.5z.com/pub/genius/%{name}-%{version}.tar.gz
+# Source0-md5:	8c17ac90dab4f586e07627b6148c39b6
+Patch0:		%{name}-termcap.patch
+Patch1:		%{name}-desktop.patch
+Patch2:		%{name}-link.patch
+URL:		http://www.jirka.org/genius.html
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	bison
@@ -22,16 +21,22 @@ BuildRequires:	gtksourceview-devel >= 0.3.0
 BuildRequires:	intltool >= 0.21
 BuildRequires:	libglade2-devel >= 2.0.1
 BuildRequires:	libgnomeui-devel >= 2.4.0
+BuildRequires:	mpfr-devel >= 2.2.0
 BuildRequires:	libtool
 BuildRequires:	ncurses-devel
-BuildRequires:	popt-devel
+BuildRequires:	pkgconfig
+BuildRequires:	readline-devel
+BuildRequires:	rpmbuild(macros) >= 1.311
 BuildRequires:	scrollkeeper
 BuildRequires:	vte-devel >= 0.8.19
-Requires(post,postun):	/sbin/ldconfig
+Requires(post,postun):	gtk+2
+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
@@ -41,44 +46,41 @@ 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
-%patch3 -p1
-%patch4 -p1
-
-mv po/{no,nb}.po
 
 %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}
 %{__automake}
 %configure \
 	--disable-static \
@@ -93,44 +95,46 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+# Thess files are autogenerated
+rm -f $RPM_BUILD_ROOT%{_datadir}/mime/{XMLnamespaces,aliases,globs,magic,mime.cache,subclasses}
+rm -rf $RPM_BUILD_ROOT%{_datadir}/mime/text
 
-# This files are autogenerated
-rm -f $RPM_BUILD_ROOT%{_datadir}/mime/{XMLnamespaces,globs,magic}
+# Obsoleted GNOME mime-info stuff
+rm -rf $RPM_BUILD_ROOT%{_datadir}/{application-registry,mime-info}
 
+[ -d $RPM_BUILD_ROOT%{_datadir}/locale/sr@latin ] || \
+	mv -f $RPM_BUILD_ROOT%{_datadir}/locale/sr@{Latn,latin}
 %find_lang %{name} --with-gnome --all-name
 
+%clean
+rm -rf $RPM_BUILD_ROOT
+
 %post
-/sbin/ldconfig
-/usr/bin/scrollkeeper-update
-update-mime-database %{_datadir}/mime
+%scrollkeeper_update_post
+%update_mime_database
+%update_icon_cache hicolor
 
 %postun
-/sbin/ldconfig
-/usr/bin/scrollkeeper-update
-update-mime-database %{_datadir}/mime
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+%update_icon_cache hicolor
+%scrollkeeper_update_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
-%{_iconsdir}/*/*/apps/*.png
+%{_datadir}/mime/packages/genius.xml
+%{_desktopdir}/gnome-genius.desktop
+%{_iconsdir}/hicolor/*/apps/gnome-genius.png
 %{_omf_dest_dir}/%{name}
 
 %files devel
 %defattr(644,root,root,755)
 # Do we really need this la and so files?
-%{_libdir}/genius/libtestplugin.so
+%attr(755,root,root) %{_libdir}/genius/libtestplugin.so
 %{_libdir}/genius/libtestplugin.la
 %{_includedir}/genius