- 2.22.0

- merged from DEVEL

Changed files:
    yelp-desktop.patch -> 1.2
    yelp.spec -> 1.122

diff --git a/yelp-desktop.patch b/yelp-desktop.patch
index 8478956ba365d62238b0d871eb74902ab0771f13..8bb74a6f554c86da39bb03322223d669af8feaf4 100644 (file)
--- a/yelp-desktop.patch
+++ b/yelp-desktop.patch
@@ -1,12 +1,12 @@
-diff -aurN yelp-2.13.4.orig/yelp.desktop.in.in yelp-2.13.4/yelp.desktop.in.in
---- yelp-2.13.4.orig/yelp.desktop.in.in        2006-01-22 18:52:02.000000000 +0100
-+++ yelp-2.13.4/yelp.desktop.in.in     2006-02-01 15:54:20.951476000 +0100
-@@ -7,7 +7,8 @@
+diff -urN yelp-2.21.90/yelp.desktop.in.in yelp-2.21.90.new/yelp.desktop.in.in
+--- yelp-2.21.90/yelp.desktop.in.in    2008-01-28 22:47:26.000000000 +0100
++++ yelp-2.21.90.new/yelp.desktop.in.in        2008-02-15 11:22:33.000000000 +0100
+@@ -6,7 +6,8 @@
  StartupNotify=true
  Terminal=false
  Type=Application
--Categories=GNOME;GTK;Application;Core;
-+Categories=GTK;GNOME;X-Help;
+-Categories=GNOME;GTK;Core;
++Categories=GNOME;GTK;X-Help;
 +OnlyShowIn=GNOME;
  X-GNOME-Bugzilla-Bugzilla=GNOME
  X-GNOME-Bugzilla-Product=Yelp

diff --git a/yelp.spec b/yelp.spec
index 1def8c92c0724f898a1518c714f07ab6bb4e7a26..44715d9f00e053c33b45f679e1d3e95847db4568 100644 (file)
--- a/yelp.spec
+++ b/yelp.spec
@@ -1,42 +1,46 @@
 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:       9
-License:       GPL
+Version:       2.22.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
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/yelp/2.22/%{name}-%{version}.tar.bz2
+# Source0-md5: 941e67796bbc332c1db3d63771ae2590
 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
+Patch2:                %{name}-beagle.patch
+URL:           http://live.gnome.org/Yelp
+BuildRequires: GConf2-devel >= 2.22.0
 BuildRequires: autoconf
-BuildRequires: automake
+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: 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.8.0.4
 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
@@ -61,17 +65,20 @@ narzędzia.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -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
+sed -i -e s#sr@Latn#sr@latin# po/LINGUAS
+mv po/nds{@NFE,}.po
+mv po/sr@{Latn,latin}.po
 
 %build
+%{__intltoolize}
 %{__libtoolize}
 %{__aclocal} -I m4
 %{__autoconf}
+%{__autoheader}
 %{__automake}
 %configure
 %{__make} -j1 \
@@ -83,7 +90,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 +108,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