From 155dfaa50680331bf06fdc25960452de2b13c409 Mon Sep 17 00:00:00 2001
From: grzegol <grzegol@pld-linux.org>
Date: Tue, 23 Mar 2004 11:54:22 +0000
Subject: [PATCH] - merged from DEVEL and updated to 2.6.0

Changed files:
    gedit.spec -> 1.56
---
 gedit.spec | 53 ++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 34 insertions(+), 19 deletions(-)

diff --git a/gedit.spec b/gedit.spec
index db2fa79..49cd84e 100644
--- a/gedit.spec
+++ b/gedit.spec
@@ -1,32 +1,38 @@
 Summary:	gEdit - small but powerful text editor for X Window
 Summary(pl):	gEdit - ma³y ale potê¿ny edytor tekstu dla X Window
 Name:		gedit2
-Version:	2.4.1
-Release:	3
+Version:	2.6.0
+Release:	1
 License:	GPL
 Group:		X11/Applications/Editors
-Source0:	http://ftp.gnome.org/pub/gnome/sources/gedit/2.4/gedit-%{version}.tar.bz2
-# Source0-md5:	ebc37dbf48451dcacb04313bcdf2e3a6
+Source0:	http://ftp.gnome.org/pub/gnome/sources/gedit/2.6/gedit-%{version}.tar.bz2
+# Source0-md5:	1c023363f917b99a57ee866da67dd66b
 Patch0:		%{name}-use_default_font.patch
+Patch1:		%{name}-locale-names.patch
 URL:		http://gedit.sourceforge.net/
-BuildRequires:	GConf2-devel >= 2.4.0
+BuildRequires:	GConf2-devel >= 2.6.0
+BuildRequires:	ORBit2-devel
 BuildRequires:	aspell-devel
 BuildRequires:	autoconf
 BuildRequires:	automake
-BuildRequires:	eel-devel >= 2.4.1
-BuildRequires:	glib2-devel >= 2.2.0
-BuildRequires:	gtksourceview-devel >= 0.7.0
-BuildRequires:	intltool >= 0.25
-BuildRequires:	libbonoboui-devel >= 2.4.0
-BuildRequires:	libglade2-devel >= 2.0.1
-BuildRequires:	libgnomeprintui-devel >= 2.4.0
-BuildRequires:	libgnomeui-devel >= 2.4.0.1
+BuildRequires:	eel-devel >= 2.6.0
+BuildRequires:	glib2-devel >= 1:2.4.0
+BuildRequires:	gnome-common >= 2.4.0
+BuildRequires:	gtksourceview-devel >= 0.9.2
+BuildRequires:	intltool >= 0.29
+BuildRequires:	libbonoboui-devel >= 2.5.4
+BuildRequires:	libglade2-devel >= 1:2.3.6
+BuildRequires:	libgnomeprintui-devel >= 2.6.0
+BuildRequires:	libgnomeui-devel >= 2.6.0
 BuildRequires:	libtool
+BuildRequires:	popt-devel >= 1.5
 BuildRequires:	rpm-build >= 4.1-10
 BuildRequires:	scrollkeeper >= 0.3.12
 BuildRequires:	xft-devel >= 2.1.2
+Requires(post):	GConf2
+Requires(post,postun):	/sbin/ldconfig
 Requires(post,postun):	scrollkeeper
-Requires:	libgnomeprintui >= 2.4.0
+Requires:	libgnomeprintui >= 2.6.0
 Obsoletes:	gedit-devel
 Obsoletes:	gedit-plugins < 2.3.3-2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -48,7 +54,7 @@ dokument
 Summary:	gEdit header files
 Summary(pl):	pliki nag³ówkowe gEdit
 Group:		X11/Development/Libraries
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{version}-%{release}
 
 %description devel
 gEdit header files
@@ -59,10 +65,18 @@ Pliki nag
 %prep
 %setup -q -n gedit-%{version}
 %patch0 -p1
+%patch1 -p1
+
+mv po/{no,nb}.po
 
 %build
 cp -f /usr/share/automake/config.sub .
-%configure
+%{__libtoolize}
+%{__aclocal} -I %{_aclocaldir}/gnome2-macros
+%{__autoconf}
+%{__automake}
+%configure \
+	--disable-schemas-install
 
 %{__make}
 
@@ -71,7 +85,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
-	omf_dest_dir=%{_omf_dest_dir}/%{name}
+	omf_dest_dir=%{_omf_dest_dir}/%{name} \
+	GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 
 # Remove obsoleted *.la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/gedit-2/plugins/*.la
@@ -114,5 +129,5 @@ scrollkeeper-update
 
 %files devel
 %defattr(644,root,root,755)
-%{_includedir}/gedit-2.4
-%{_pkgconfigdir}/gedit-2.4.pc
+%{_includedir}/gedit-*
+%{_pkgconfigdir}/gedit-*.pc
-- 
2.44.0