X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=yelp.spec;h=bf33a12bc13e3c142ecd5e0a2022c69ccf74a95d;hb=be50cf17f91fb12cb02ded4d93b48f43f27ff31e;hp=6c0e7881bf5cf46893832a58acc01837bf9d347d;hpb=f231837fa2d95dae1257ecc1cfcf618eda3560ff;p=packages%2Fyelp.git

diff --git a/yelp.spec b/yelp.spec
index 6c0e788..bf33a12 100644
--- a/yelp.spec
+++ b/yelp.spec
@@ -1,47 +1,49 @@
 Summary:	A system documentation reader from the GNOME project
 Summary(pl.UTF-8):	Czytnik dokumentacji z projektu GNOME
 Name:		yelp
-Version:	2.16.2
-Release:	2
-License:	GPL
+Version:	2.30.0
+Release:	1
+License:	GPL v2
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/gnome/sources/yelp/2.16/%{name}-%{version}.tar.bz2
-# Source0-md5:	ac55332d62c1871b3de92b5c1f0befaa
-Patch0:		%{name}-desktop.patch
-Patch1:		%{name}-bs.patch
-URL:		http://www.gnome.org/
-BuildRequires:	GConf2-devel >= 2.16.0
-BuildRequires:	ORBit2-devel >= 1:2.14.4
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/yelp/2.30/%{name}-%{version}.tar.bz2
+# Source0-md5:	9a5674664568844616bcf169dce7e1a6
+Patch0:		%{name}-libxul.patch
+URL:		http://live.gnome.org/Yelp
+BuildRequires:	GConf2-devel >= 2.26.0
 BuildRequires:	autoconf
-BuildRequires:	automake
-BuildRequires:	beagle-devel >= 0.2.13
+BuildRequires:	automake >= 1:1.9
 BuildRequires:	bzip2-devel
-BuildRequires:	dbus-glib-devel >= 0.71
-BuildRequires:	gnome-common >= 2.12.0
-BuildRequires:	gnome-doc-utils >= 0.8.0
-BuildRequires:	gnome-vfs2-devel >= 2.16.3
-BuildRequires:	libglade2-devel >= 1:2.6.0
-BuildRequires:	libgnomeui-devel >= 2.16.1
+BuildRequires:	dbus-glib-devel >= 0.74
+BuildRequires:	gettext-devel
+BuildRequires:	gnome-common >= 2.24.0
+BuildRequires:	gnome-doc-utils >= 0.20.0
+BuildRequires:	gtk+2-devel >= 2:2.18.0
+BuildRequires:	intltool >= 0.37.0
+BuildRequires:	libbeagle-devel >= 0.3.0
 BuildRequires:	libtool
-BuildRequires:	libxml2-devel >= 1:2.6.27
-BuildRequires:	libxslt-devel >= 1.1.17
-BuildRequires:	xulrunner-devel >= 1.8.0.4
+BuildRequires:	libxml2-devel >= 1:2.6.31
+BuildRequires:	libxslt-devel >= 1.1.22
 BuildRequires:	pkgconfig >= 1:0.15.0
+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 >= 2.16.0
-Requires(post,postun):	gtk+2 >= 2:2.10.6
+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.8.0
-Requires:	gnome-vfs2 >= 2.16.3
-Requires:	libgnomeui >= 2.16.1
+Requires:	gnome-doc-utils >= 0.20.0
 Requires:	scrollkeeper
 %requires_eq_to	xulrunner xulrunner-devel
+# sr@Latn vs. sr@latin
+Conflicts:	glibc-misc < 6:2.7
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # can be provided by mozilla or mozilla-embedded
 %define		_noautoreqdep	libgtkembedmoz.so libgtksuperwin.so libxpcom.so
+# we have strict deps for it
+%define		_noautoreq	libxpcom.so
 
 %description
 Yelp is the GNOME help/documentation browser. It is designed to help
@@ -55,15 +57,22 @@ narzędzia.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
+
+# fix locale names
+# drop en@shaw locale
+sed -i -e s#en@shaw## po/LINGUAS
+rm -f po/en@shaw.po
 
 %build
+%{__intltoolize}
 %{__libtoolize}
 %{__aclocal} -I m4
 %{__autoconf}
+%{__autoheader}
 %{__automake}
 %configure
-%{__make}
+%{__make} -j1 \
+	CFLAGS="%{rpmcflags} -DI_KNOW_RARIAN_0_8_IS_UNSTABLE"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -71,9 +80,7 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-mv $RPM_BUILD_ROOT%{_datadir}/locale/nds{@NFE,}
-
-%find_lang %{name} --with-gnome
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -91,8 +98,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