SPECS: yelp.spec - merge from DEVEL

[qwiat]

Author: qwiat                        Date: Sat Oct  4 21:32:40 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merge from DEVEL

---- Files affected:
SPECS:
   yelp.spec (1.129 -> 1.130) 

---- Diffs:

================================================================
Index: SPECS/yelp.spec
diff -u SPECS/yelp.spec:1.129 SPECS/yelp.spec:1.130
--- SPECS/yelp.spec:1.129	Tue Sep 30 12:25:47 2008
+++ SPECS/yelp.spec	Sat Oct  4 23:32:35 2008
@@ -2,16 +2,14 @@
 Summary:	A system documentation reader from the GNOME project
 Summary(pl.UTF-8):	Czytnik dokumentacji z projektu GNOME
 Name:		yelp
-Version:	2.22.1
-Release:	6
+Version:	2.24.0
+Release:	1
 License:	GPL v2
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/yelp/2.22/%{name}-%{version}.tar.bz2
-# Source0-md5:	a292c6712bb820e6aa2ade84ebdc9609
-Patch0:		%{name}-desktop.patch
-Patch1:		%{name}-bs.patch
-Patch2:		%{name}-beagle.patch
-Patch3:		%{name}-libxul.patch
+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
@@ -66,15 +64,10 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 # fix locale names
 sed -i -e s#nds at NFE#nds# po/LINGUAS
-sed -i -e s#sr at Latn#sr at latin# po/LINGUAS
 mv po/nds{@NFE,}.po
-mv po/sr@{Latn,latin}.po
 
 %build
 %{__intltoolize}
@@ -124,9 +117,34 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.130  2008/10/04 21:32:35  qwiat
+- merge from DEVEL
+
+Revision 1.125.2.7  2008/10/04 21:24:01  qwiat
+- fixed log
+
+Revision 1.125.2.6  2008/10/04 21:22:56  qwiat
+- fixed log
+
+Revision 1.125.2.5  2008/10/04 21:16:05  qwiat
+- up to 2.24
+- removed obsolete patch
+
 Revision 1.129  2008/09/30 10:25:47  hawk
 - release 6
 
+Revision 1.125.2.4  2008/09/13 14:44:06  patrys
+- proper desktop categories
+- drop bs patch (no changes)
+- push desktop patch upstream
+
+Revision 1.125.2.3  2008/09/04 11:27:40  patrys
+- 2.23.91
+
+Revision 1.125.2.2  2008/08/21 23:45:21  megabajt
+- updated to 2.23.2 (fixes CVE-2008-3533)
+- added -libxul.patch to fix build with xulrunner 1.9
+
 Revision 1.128  2008/07/23 15:16:03  hawk
 - release 5
 
@@ -136,6 +154,9 @@
 
 Revision 1.126  2008/06/28 20:08:55  arekm
 - release 3
+
+Revision 1.125.2.1  2008/06/03 10:00:47  patrys
+- 2.23.1
 
 Revision 1.125  2008-04-23 07:48:59  hawk
 - release 2
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/yelp.spec?r1=1.129&r2=1.130&f=u