- merge from DEVEL

[packages/yelp.git] / yelp.spec

diff --git a/yelp.spec b/yelp.spec
index a53e80d19f221c697e84e037236c74f8237449ff..c7c1a1b94f1c6313d34a63ac6b35e9134b9751e8 100644 (file)
--- a/yelp.spec
+++ b/yelp.spec
@@ -1,62 +1,83 @@
-# TODO:
-# move stylesheets to /usr/share/sgml
-# use more generic stylesheet location
-# remove docbook dtds and stylesheets from package and use system xml catalog

 Summary:       A system documentation reader from the GNOME project
 Summary:       A system documentation reader from the GNOME project

-Summary(pl):   Czytnik dokumentacji z projektu GNOME
+Summary(pl.UTF-8):     Czytnik dokumentacji z projektu GNOME

 Name:          yelp
 Name:          yelp

-Version:       2.6.5
-Release:       2
-License:       GPL
+Version:       2.24.0
+Release:       1
+License:       GPL v2

 Group:         X11/Applications
 Group:         X11/Applications

-Source0:       http://ftp.gnome.org/pub/gnome/sources/%{name}/2.6/%{name}-%{version}.tar.bz2
-# Source0-md5: 9bd94af344ee6a0bf69aa6f9cbd6b7e9
-Patch0:                %{name}-desktop-categories.patch
-URL:           http://www.gnome.org/
-BuildRequires: GConf2-devel >= 2.6.1
-BuildRequires: ORBit2-devel >= 1:2.10.0
+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: autoconf

-BuildRequires: automake
+BuildRequires: automake >= 1:1.9

 BuildRequires: bzip2-devel
 BuildRequires: bzip2-devel

-BuildRequires: glib2-devel >= 1:2.4.0
-BuildRequires: gnome-common >= 2.8.0
-BuildRequires: gnome-vfs2-devel >= 2.6.1.1
-BuildRequires: libglade2-devel >= 1:2.4.0
-BuildRequires: libgnomeui-devel >= 2.6.0
-BuildRequires: libgtkhtml-devel >= 2.6.1
+BuildRequires: dbus-glib-devel >= 0.74
+BuildRequires: gettext-devel
+BuildRequires: gnome-common >= 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.22.0

 BuildRequires: libtool
 BuildRequires: libtool

-BuildRequires: libxml2-devel >= 2.6.9
-BuildRequires: libxslt-devel >= 1.1.5
+BuildRequires: libxml2-devel >= 1:2.6.31
+BuildRequires: libxslt-devel >= 1.1.22

 BuildRequires: pkgconfig >= 1:0.15.0
 BuildRequires: pkgconfig >= 1:0.15.0

-BuildRequires: popt-devel
-BuildRequires: rpm-build >= 4.1-10
-Requires(post):        GConf2
+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,postun): gtk+2
+Requires(post,postun): hicolor-icon-theme
+Requires(post,preun):  GConf2

 Requires:      docbook-style-xsl >= 1.55.0
 Requires:      docbook-style-xsl >= 1.55.0

-Requires:      gnome-mime-data >= 2.4.1
-Requires:      gnome-vfs2 >= 2.6.1.1
+Requires:      gnome-doc-utils >= 0.12.1
+Requires:      gnome-vfs2 >= 2.22.0
+Requires:      libgnomeui >= 2.22.0

 Requires:      scrollkeeper
 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)
 
 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
 %description

-Yelp is the GNOME 2 help/documentation browser. It is designed to help
+Yelp is the GNOME help/documentation browser. It is designed to help

 you browse all the documentation on your system in one central tool.
 
 you browse all the documentation on your system in one central tool.
 

-%description -l pl
-Yelp jest przegl±dark± pomocy i dokumentacji GNOME 2. Ma pomagaæ w
-przegl±daniu ca³ej dokumentacji systemu w jednym, centralnym
-narzêdziu.
+%description -l pl.UTF-8
+Yelp jest przeglądarką pomocy i dokumentacji GNOME. Umożliwia
+przeglądanie całej dokumentacji systemu za pomocą jednego, centralnego
+narzędzia.

 
 %prep
 %setup -q
 %patch0 -p1
 
 
 %prep
 %setup -q
 %patch0 -p1
 

+# fix locale names
+sed -i -e s#nds@NFE#nds# po/LINGUAS
+mv po/nds{@NFE,}.po
+

 %build
 %build

+%{__intltoolize}

 %{__libtoolize}
 %{__libtoolize}

-%{__aclocal}
+%{__aclocal} -I m4

 %{__autoconf}
 %{__autoconf}

+%{__autoheader}

 %{__automake}
 %configure
 %{__automake}
 %configure

-%{__make}
+%{__make} -j1 \
+       CFLAGS="%{rpmcflags} -DI_KNOW_RARIAN_0_8_IS_UNSTABLE"

 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %install
 rm -rf $RPM_BUILD_ROOT


@@ -64,21 +85,27 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 

-rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
-
-%find_lang %{name} --with-gnome --all-name
+%find_lang %{name}

 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post

-%gconf_schema_install
+%gconf_schema_install yelp.schemas
+%update_icon_cache hicolor
+
+%preun
+%gconf_schema_uninstall yelp.schemas
+
+%postun
+%update_icon_cache hicolor

 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc README ChangeLog NEWS TODO AUTHORS
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc README ChangeLog NEWS TODO AUTHORS

-%attr(755,root,root) %{_bindir}/*
-%{_datadir}/%{name}
-%{_libdir}/bonobo/servers/*
-%{_datadir}/sgml/docbook/%{name}
-%{_desktopdir}/*
+%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