SPECS: gedit2.spec - merged from DEVEL - updated deps

megabajt megabajt at pld-linux.org
Thu Oct 9 22:40:21 CEST 2008 

Author: megabajt                     Date: Thu Oct  9 20:40:21 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged from DEVEL
- updated deps

---- Files affected:
SPECS:
   gedit2.spec (1.124 -> 1.125) 

---- Diffs:

================================================================
Index: SPECS/gedit2.spec
diff -u SPECS/gedit2.spec:1.124 SPECS/gedit2.spec:1.125
--- SPECS/gedit2.spec:1.124	Fri Oct  3 19:43:40 2008
+++ SPECS/gedit2.spec	Thu Oct  9 22:40:16 2008
@@ -2,31 +2,31 @@
 Summary:	gedit - small but powerful text editor for X Window
 Summary(pl.UTF-8):	gedit - mały ale potężny edytor tekstu dla X Window
 Name:		gedit2
-Version:	2.22.3
-Release:	2
+Version:	2.24.0
+Release:	1
 License:	GPL v2
 Group:		X11/Applications/Editors
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/gedit/2.22/gedit-%{version}.tar.bz2
-# Source0-md5:	9af45548bf8f2c335906c95877df4699
-Patch0:		%{name}-libtool.patch
-URL:		http://gedit.sourceforge.net/
-BuildRequires:	GConf2-devel >= 2.22.0
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gedit/2.24/gedit-%{version}.tar.bz2
+# Source0-md5:	c6a13bd45ddde3e6a1e45131f430086b
+# http://bugzilla.gnome.org/show_bug.cgi?id=552038
+Patch0:		%{name}-python.patch
+URL:		http://www.gnome.org/projects/gedit/
+BuildRequires:	GConf2-devel >= 2.24.0
+BuildRequires:	attr-devel
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake >= 1:1.8
 BuildRequires:	enchant-devel >= 1.2.0
 BuildRequires:	gettext-devel
-BuildRequires:	glib2-devel >= 1:2.16.0
-BuildRequires:	gnome-common >= 2.20.0
-BuildRequires:	gnome-doc-utils >= 0.12.2
-BuildRequires:	gnome-vfs2-devel >= 2.22.0
-BuildRequires:	gtk+2-devel >= 2:2.12.9
+BuildRequires:	glib2-devel >= 1:2.18.0
+BuildRequires:	gnome-common >= 2.24.0
+BuildRequires:	gnome-doc-utils >= 0.14.0
+BuildRequires:	gtk+2-devel >= 2:2.14.0
 BuildRequires:	gtk-doc >= 1.8
 BuildRequires:	gtksourceview2-devel >= 2.2.0
-BuildRequires:	intltool >= 0.36.2
+BuildRequires:	intltool >= 0.40.0
 BuildRequires:	iso-codes >= 0.35
-BuildRequires:	libglade2-devel >= 1:2.6.2
-BuildRequires:	libgnomeui-devel >= 2.22.1
 BuildRequires:	libtool
+BuildRequires:	libxml2-devel >= 1:2.6.31
 BuildRequires:	pkgconfig
 BuildRequires:	python-devel >= 2.3
 BuildRequires:	python-gtksourceview2-devel >= 2.2.0
@@ -35,11 +35,10 @@
 BuildRequires:	rpmbuild(macros) >= 1.197
 BuildRequires:	scrollkeeper >= 0.3.12
 BuildRequires:	sed >= 4.0
+BuildRequires:	xorg-lib-libSM-devel
 Requires(post,postun):	desktop-file-utils
 Requires(post,postun):	scrollkeeper
 Requires(post,preun):	GConf2
-Requires:	gnome-vfs2 >= 2.22.0
-Requires:	libgnomeui >= 2.22.1
 Requires:	python-gtksourceview2 >= 2.2.0
 Suggests:	python-vte
 Obsoletes:	gedit-devel
@@ -67,8 +66,6 @@
 Group:		X11/Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	gtksourceview2-devel >= 2.2.0
-Requires:	libglade2-devel >= 1:2.6.2
-Requires:	libgnomeui-devel >= 2.22.1
 
 %description devel
 gedit header files.
@@ -91,10 +88,8 @@
 %prep
 %setup -q -n gedit-%{version}
 %patch0 -p1
-sed -i 's/codegen.py/codegen.pyc/' configure.ac
 
-sed -i -e 's#sr at Latn#sr at latin#' po/LINGUAS
-mv po/sr@{Latn,latin}.po
+sed -i 's/codegen.py/codegen.pyc/' configure.ac
 
 %build
 %{__gnome_doc_common}
@@ -115,7 +110,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} -j1 install \
+%{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
 	GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 
@@ -159,11 +154,11 @@
 %dir %{_libdir}/gedit-2/plugins/snippets
 %attr(755,root,root) %{_libdir}/gedit-2/gedit-bugreport.sh
 %attr(755,root,root) %{_libdir}/gedit-2/plugins/*.so
-%{_libdir}/gedit-2/plugins/externaltools/*.glade
+%{_libdir}/gedit-2/plugins/externaltools/*.ui
 %{_libdir}/gedit-2/plugins/externaltools/*.py[co]
 %{_libdir}/gedit-2/plugins/*.gedit-plugin
 %{_libdir}/gedit-2/plugins/pythonconsole/*.py[co]
-%{_libdir}/gedit-2/plugins/snippets/*.glade
+%{_libdir}/gedit-2/plugins/snippets/*.ui
 %{_libdir}/gedit-2/plugins/snippets/*.py[co]
 %{_datadir}/gedit-2
 %{_desktopdir}/gedit.desktop
@@ -184,12 +179,43 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.125  2008/10/09 20:40:16  megabajt
+- merged from DEVEL
+- updated deps
+
 Revision 1.124  2008/10/03 17:43:40  arekm
 - release 2
 
-Revision 1.123  2008-05-28 15:22:53  megabajt
+Revision 1.122.2.8  2008/09/27 23:25:16  qwiat
+- up to 2.24
+- BR
+
+Revision 1.122.2.7  2008/09/12 21:40:24  patrys
+- 2.23.92
+- drop libtool patch (obsoleted by python patch)
+- add python patch
+
+Revision 1.122.2.6  2008/09/04 09:45:37  patrys
+- 2.23.91
+
+Revision 1.122.2.5  2008/08/21 13:24:05  megabajt
+- updated to 2.23.90
+
+Revision 1.122.2.4  2008/08/18 12:14:59  patrys
+- does no longer depend on libgnomeui
+
+Revision 1.122.2.3  2008/08/17 23:07:07  patrys
+- 2.23.3
+
+Revision 1.122.2.2  2008/07/06 19:10:22  megabajt
+- apply -libtool.patch
+
+Revision 1.123  2008/05/28 15:22:53  megabajt
 - updated to 2.22.3
 - added -libtool.patch
+
+Revision 1.122.2.1  2008/05/13 12:07:05  patrys
+- 2.23.1
 
 Revision 1.122  2008-04-10 14:27:19  megabajt
 - updated to 2.22.1
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/gedit2.spec?r1=1.124&r2=1.125&f=u

More information about the pld-cvs-commit mailing list