SPECS: gedit2.spec - merged from DEVEL

freetz freetz at pld-linux.org
Sun Apr 2 16:54:33 CEST 2006 

Author: freetz                       Date: Sun Apr  2 14:54:33 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged from DEVEL

---- Files affected:
SPECS:
   gedit2.spec (1.85 -> 1.86) 

---- Diffs:

================================================================
Index: SPECS/gedit2.spec
diff -u SPECS/gedit2.spec:1.85 SPECS/gedit2.spec:1.86
--- SPECS/gedit2.spec:1.85	Tue Oct  4 23:06:36 2005
+++ SPECS/gedit2.spec	Sun Apr  2 16:54:28 2006
@@ -2,12 +2,12 @@
 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.12.1
+Version:	2.14.1
 Release:	1
 License:	GPL v2
 Group:		X11/Applications/Editors
-Source0:	http://ftp.gnome.org/pub/gnome/sources/gedit/2.12/gedit-%{version}.tar.bz2
-# Source0-md5:	13f376c6c63b0fbd25ba9b6c7d6fb97c
+Source0:	http://ftp.gnome.org/pub/gnome/sources/gedit/2.14/gedit-%{version}.tar.bz2
+# Source0-md5:	b51974a4bcaad0b14644c9f5a22f13f2
 Patch0:		%{name}-use_default_font.patch
 Patch1:		%{name}-desktop.patch
 URL:		http://gedit.sourceforge.net/
@@ -19,6 +19,7 @@
 BuildRequires:	eel-devel >= 2.10.0
 BuildRequires:	gettext-devel
 BuildRequires:	gnome-common >= 2.8.0-2
+BuildRequires:	gnome-doc-utils >= 0.3.2
 BuildRequires:	gnome-menus-devel >= 2.12.0
 BuildRequires:	gtksourceview-devel >= 1.3.91
 BuildRequires:	intltool >= 0.33
@@ -28,15 +29,15 @@
 BuildRequires:	libtool
 BuildRequires:	pkgconfig
 BuildRequires:	popt-devel >= 1.5
+BuildRequires:	python-gnome-desktop-devel >= 2.12.0
 BuildRequires:	rpm-build >= 4.1-10
 BuildRequires:	rpmbuild(macros) >= 1.197
 BuildRequires:	scrollkeeper >= 0.3.12
-BuildRequires:	xft-devel >= 2.1.2
-Requires(post,postun):	/sbin/ldconfig
 Requires(post,preun):	GConf2
 Requires(post,postun):	desktop-file-utils
 Requires(post,postun):	scrollkeeper
 Requires:	libgnomeprintui >= 2.10.2
+#Suggests:	python-gnome-desktop-gtksourceview >= 2.13.3
 Obsoletes:	gedit-devel
 Obsoletes:	gedit-plugins < 2.3.3-2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -75,16 +76,20 @@
 %setup -q -n gedit-%{version}
 %patch0 -p1
 %patch1 -p1
+sed -i 's/codegen.py/codegen.pyc/' configure.ac
 
 %build
 %{__gnome_doc_common}
 %{__libtoolize}
 %{__intltoolize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__automake}
 %configure \
-	--disable-schemas-install
+	--disable-schemas-install \
+	--disable-scrollkeeper \
+	--enable-python \
+	--with-omf-dir=%{_omf_dest_dir}/%{name}
 %{__make}
 
 %install
@@ -92,15 +97,13 @@
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
-	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
-
-rm -r $RPM_BUILD_ROOT%{_datadir}/{application-registry,mime-info}
-
 rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
+rm -f $RPM_BUILD_ROOT%{_libdir}/gedit-2/plugins/*.py
+rm -f $RPM_BUILD_ROOT%{_libdir}/gedit-2/plugins/{externaltools,snippets}/*.py
 
 %find_lang %{name} --with-gnome --all-name
 
@@ -123,19 +126,25 @@
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc README ChangeLog TODO AUTHORS THANKS
+%doc README ChangeLog TODO AUTHORS
 %{_sysconfdir}/gconf/schemas/gedit.schemas
 %attr(755,root,root) %{_bindir}/*
 %dir %{_libdir}/gedit-2
 %dir %{_libdir}/gedit-2/plugins
-%attr(755,root,root) %{_libdir}/gedit-2/plugins/*.so*
-%{_libdir}/bonobo/servers/*
+%dir %{_libdir}/gedit-2/plugins/externaltools
+%dir %{_libdir}/gedit-2/plugins/snippets
+%attr(755,root,root) %{_libdir}/gedit-2/plugins/*.so
+%{_libdir}/gedit-2/plugins/externaltools/*.glade
+%{_libdir}/gedit-2/plugins/externaltools/*.py[co]
 %{_libdir}/gedit-2/plugins/*.gedit-plugin
+%{_libdir}/gedit-2/plugins/*.py[co]
+%{_libdir}/gedit-2/plugins/snippets/*.glade
+%{_libdir}/gedit-2/plugins/snippets/*.py[co]
 %{_datadir}/gedit-2
-%{_datadir}/idl/*
 %{_desktopdir}/*
 %{_mandir}/man1/*
 %{_omf_dest_dir}/%{name}
+%{_omf_dest_dir}/gedit
 %{_pixmapsdir}/*
 
 %files devel
@@ -149,6 +158,51 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.86  2006/04/02 14:54:28  freetz
+- merged from DEVEL
+
+Revision 1.85.2.13  2006/03/16 16:49:50  freetz
+- 2.14.1
+
+Revision 1.85.2.12  2006/03/12 22:49:00  freetz
+- 2.14.0
+
+Revision 1.85.2.11  2006/03/06 17:55:56  freetz
+- 2.13.93
+
+Revision 1.85.2.10  2006/02/27 09:08:55  freetz
+- 2.13.92
+
+Revision 1.85.2.9  2006/02/13 21:10:59  freetz
+- 2.13.91, packaged scrollkeeper docs not moved to gnome-doc yet
+
+Revision 1.85.2.8  2006/01/31 17:42:32  freetz
+- remove attr for py[co]
+
+Revision 1.85.2.7  2006/01/31 16:41:16  freetz
+- 2.13.90
+
+Revision 1.85.2.6  2006/01/16 12:30:39  patrys
+- up to 2.13.2
+- another 'patrys upgrade mess'
+- for freetz with love
+- don't expect production spec quality from DEVEL
+
+Revision 1.85.2.5  2006/01/07 00:33:26  freetz
+- don't expect more files then provided - s/.so*/.so
+
+Revision 1.85.2.4  2006/01/07 00:30:44  freetz
+- keep out scrollkeeper from updating a database at build time
+
+Revision 1.85.2.3  2006/01/07 00:22:40  freetz
+- fixed partially mess called 'upgrade by patrys'
+
+Revision 1.85.2.2  2006/01/04 22:26:14  patrys
+- enabled support for python plugins
+
+Revision 1.85.2.1  2006/01/03 22:54:40  patrys
+- up to 2.13.1
+
 Revision 1.85  2005/10/04 21:06:36  freetz
 - 2.12.1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/gedit2.spec?r1=1.85&r2=1.86&f=u

More information about the pld-cvs-commit mailing list