X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=blobdiff_plain;f=yelp.spec;h=c7c1a1b94f1c6313d34a63ac6b35e9134b9751e8;hb=fb369ae97504bd97cfd8b4afa7c3c1fc378e6900;hp=1c16298136289ce3549cfc3ca6c10cf6b584adcb;hpb=dfca46cd72a4589ec7a65fe15c7f0d347ba42a6f;p=packages%2Fyelp.git

diff --git a/yelp.spec b/yelp.spec
index 1c16298..c7c1a1b 100644
--- a/yelp.spec
+++ b/yelp.spec
@@ -1,42 +1,45 @@
 Summary:	A system documentation reader from the GNOME project
 Summary(pl.UTF-8):	Czytnik dokumentacji z projektu GNOME
 Name:		yelp
-Version:	2.20.0
-Release:	8
-License:	GPL
+Version:	2.24.0
+Release:	1
+License:	GPL v2
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/yelp/2.20/%{name}-%{version}.tar.bz2
-# Source0-md5:	8902618c343093b1c64ee6d647ec41ed
-Patch0:		%{name}-desktop.patch
-Patch1:		%{name}-bs.patch
-URL:		http://www.gnome.org/
-BuildRequires:	GConf2-devel >= 2.20.0
-BuildRequires:	ORBit2-devel >= 1:2.14.9
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/yelp/2.24/%{name}-%{version}.tar.bz2
+# Source0-md5:	15eb2f538d970600c1e0a461f7d88b55
+# http://bugzilla.gnome.org/show_bug.cgi?id=552128
+Patch0:		%{name}-libxul.patch
+URL:		http://live.gnome.org/Yelp
+BuildRequires:	GConf2-devel >= 2.22.0
 BuildRequires:	autoconf
-BuildRequires:	automake
-BuildRequires:	beagle-devel >= 0.2.13
+BuildRequires:	automake >= 1:1.9
 BuildRequires:	bzip2-devel
-BuildRequires:	dbus-glib-devel >= 0.73
+BuildRequires:	dbus-glib-devel >= 0.74
+BuildRequires:	gettext-devel
 BuildRequires:	gnome-common >= 2.20.0
-BuildRequires:	gnome-doc-utils >= 0.12.0
-BuildRequires:	gnome-vfs2-devel >= 2.20.0
+BuildRequires:	gnome-doc-utils >= 0.12.1
+BuildRequires:	gnome-vfs2-devel >= 2.22.0
+BuildRequires:	gtk+2-devel >= 2:2.12.8
+BuildRequires:	intltool >= 0.37.0
+BuildRequires:	libbeagle-devel >= 0.3.0
 BuildRequires:	libglade2-devel >= 1:2.6.2
-BuildRequires:	libgnomeui-devel >= 2.20.0
+BuildRequires:	libgnomeui-devel >= 2.22.0
 BuildRequires:	libtool
-BuildRequires:	libxml2-devel >= 1:2.6.30
+BuildRequires:	libxml2-devel >= 1:2.6.31
 BuildRequires:	libxslt-devel >= 1.1.22
-BuildRequires:	xulrunner-devel >= 1.8.0.4
 BuildRequires:	pkgconfig >= 1:0.15.0
-BuildRequires:	rarian-devel
+BuildRequires:	rarian-devel >= 0.7.0
 BuildRequires:	rpmbuild(macros) >= 1.311
+BuildRequires:	startup-notification-devel >= 0.8
+BuildRequires:	xulrunner-devel >= 1.9-5
 BuildRequires:	zlib-devel
-Requires(post,preun):	GConf2
 Requires(post,postun):	gtk+2
 Requires(post,postun):	hicolor-icon-theme
+Requires(post,preun):	GConf2
 Requires:	docbook-style-xsl >= 1.55.0
-Requires:	gnome-doc-utils >= 0.12.0
-Requires:	gnome-vfs2 >= 2.20.0
-Requires:	libgnomeui >= 2.20.0
+Requires:	gnome-doc-utils >= 0.12.1
+Requires:	gnome-vfs2 >= 2.22.0
+Requires:	libgnomeui >= 2.22.0
 Requires:	scrollkeeper
 %requires_eq_to	xulrunner xulrunner-devel
 # sr@Latn vs. sr@latin
@@ -60,18 +63,17 @@ narzędzia.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 # fix locale names
-sed -i -e s#nds\@NFE#nds# po/LINGUAS
-sed -i -e s#sr\@Latn#sr\@latin# po/LINGUAS
-mv po/nds{\@NFE,}.po
-mv po/sr\@{Latn,latin}.po
+sed -i -e s#nds@NFE#nds# po/LINGUAS
+mv po/nds{@NFE,}.po
 
 %build
+%{__intltoolize}
 %{__libtoolize}
 %{__aclocal} -I m4
 %{__autoconf}
+%{__autoheader}
 %{__automake}
 %configure
 %{__make} -j1 \
@@ -83,7 +85,7 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-%find_lang %{name} --with-gnome
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -101,8 +103,9 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc README ChangeLog NEWS TODO AUTHORS
-%attr(755,root,root) %{_bindir}/*
-%{_datadir}/%{name}
-%{_desktopdir}/*.desktop
+%attr(755,root,root) %{_bindir}/gnome-help
+%attr(755,root,root) %{_bindir}/yelp
+%{_datadir}/yelp
+%{_desktopdir}/yelp.desktop
 %{_iconsdir}/hicolor/*/*/yelp-icon-big.png
 %{_sysconfdir}/gconf/schemas/yelp.schemas