packages: gedit2/gedit2.spec - updated to 3.0.0; merged from DEVEL

megabajt megabajt at pld-linux.org
Tue Apr 5 20:31:14 CEST 2011 

Author: megabajt                     Date: Tue Apr  5 18:31:14 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 3.0.0; merged from DEVEL

---- Files affected:
packages/gedit2:
   gedit2.spec (1.147 -> 1.148) 

---- Diffs:

================================================================
Index: packages/gedit2/gedit2.spec
diff -u packages/gedit2/gedit2.spec:1.147 packages/gedit2/gedit2.spec:1.148
--- packages/gedit2/gedit2.spec:1.147	Sun Mar 27 08:34:44 2011
+++ packages/gedit2/gedit2.spec	Tue Apr  5 20:31:09 2011
@@ -2,54 +2,57 @@
 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.30.4
+Version:	3.0.0
 Release:	1
 License:	GPL v2
 Group:		X11/Applications/Editors
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/gedit/2.30/gedit-%{version}.tar.bz2
-# Source0-md5:	e1eecb0a92a1a363b3d375ec5ac0fb3b
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gedit/3.0/gedit-%{version}.tar.bz2
+# Source0-md5:	17d15d033540d30a3318b3062491b7a6
 URL:		http://www.gnome.org/projects/gedit/
-BuildRequires:	GConf2-devel >= 2.24.0
-BuildRequires:	attr-devel
 BuildRequires:	autoconf >= 2.64
 BuildRequires:	automake >= 1:1.10
 BuildRequires:	docbook-dtd412-xml
 BuildRequires:	enchant-devel >= 1.2.0
 BuildRequires:	gettext-devel
-BuildRequires:	glib2-devel >= 1:2.24.0
+BuildRequires:	glib2-devel >= 1:2.28.0
 BuildRequires:	gnome-common >= 2.24.0
 BuildRequires:	gnome-doc-utils >= 0.14.0
-BuildRequires:	gtk+2-devel >= 2:2.18.0
+BuildRequires:	gobject-introspection-devel >= 0.10.0
+BuildRequires:	gsettings-desktop-schemas-devel >= 3.0.0
+BuildRequires:	gtk+3-devel >= 3.0.2
 BuildRequires:	gtk-doc >= 1.8
-BuildRequires:	gtksourceview2-devel >= 2.10.0
+BuildRequires:	gtksourceview3-devel >= 3.0.0
 BuildRequires:	intltool >= 0.40.0
 BuildRequires:	iso-codes >= 0.35
+BuildRequires:	libpeas-devel >= 1.0.0
+BuildRequires:	libpeas-gtk-devel >= 1.0.0
 BuildRequires:	libsoup-devel
-BuildRequires:	libtool
+BuildRequires:	libtool >= 2:2.2.6
 BuildRequires:	libxml2-devel >= 1:2.6.31
+BuildRequires:	libzeitgeist-devel >= 0.3.2
 BuildRequires:	pkgconfig
 BuildRequires:	python-devel >= 2.3
-BuildRequires:	python-gtksourceview2-devel >= 2.10.0
-BuildRequires:	python-pygobject-devel >= 2.16.0
-BuildRequires:	python-pygtk-devel >= 2:2.12.0
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(find_lang) >= 1.23
-BuildRequires:	rpmbuild(macros) >= 1.197
+BuildRequires:	rpmbuild(macros) >= 1.601
 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:	python-gtksourceview2 >= 2.10.0
-Requires:	python-pygobject >= 2.16.0
-Suggests:	python-vte
+Requires(post,postun):	glib2 >= 1:2.26.0
+Requires:	gsettings-desktop-schemas >= 3.0.0
+Requires:	libpeas-loader-python >= 1.0.0
+Requires:	python-pycairo
+Requires:	python-pygobject >= 2.28.0
 Obsoletes:	gedit-devel
 Obsoletes:	gedit-plugins < 2.3.3-2
 # sr at Latn vs. sr at latin
 Conflicts:	glibc-misc < 6:2.7
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define	skip_post_check_so libgedit-private.so.0.0.0
+
 %description
 gedit is a small but powerful text editor for GTK+ and/or GNOME. It
 includes such features as split-screen mode, a plugin API, which
@@ -68,7 +71,9 @@
 Summary(pl.UTF-8):	Pliki nagłówkowe gedit
 Group:		X11/Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	gtksourceview2-devel >= 2.9.7
+Requires:	gtksourceview3-devel >= 3.0.0
+Requires:	libpeas-devel >= 1.0.0
+Requires:	libpeas-gtk-devel >= 1.0.0
 
 %description devel
 gedit header files.
@@ -91,9 +96,6 @@
 %prep
 %setup -q -n gedit-%{version}
 
-sed -i 's/codegen.py/codegen.pyc/' configure.ac
-sed -i 's/h2def.py/h2def.pyc/' configure.ac
-
 %build
 %{__gtkdocize}
 %{__libtoolize}
@@ -103,11 +105,10 @@
 %{__autoheader}
 %{__automake}
 %configure \
-	--disable-schemas-install \
 	--disable-scrollkeeper \
 	--disable-silent-rules \
-	--enable-python \
 	--enable-gtk-doc \
+	--disable-static \
 	--with-html-dir=%{_gtkdocdir}
 %{__make}
 
@@ -115,13 +116,13 @@
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT \
-	GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
+	DESTDIR=$RPM_BUILD_ROOT
+
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/gedit/plugins/*.la \
+	$RPM_BUILD_ROOT%{_libdir}/gedit/plugins/*/*.py \
+	$RPM_BUILD_ROOT%{_libdir}/*.la
 
-# Remove unneeded *.la files
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/gedit-2/{plugins,plugin-loaders}/*.la
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/gedit-2/plugins/*.py
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/gedit-2/plugins/*/*.py
+%py_postclean
 
 %find_lang gedit --with-gnome --with-omf
 
@@ -130,50 +131,58 @@
 
 %post
 /sbin/ldconfig
-%gconf_schema_install gedit-file-browser.schemas
-%gconf_schema_install gedit.schemas
 %scrollkeeper_update_post
 %update_desktop_database_post
-
-%preun
-%gconf_schema_uninstall gedit-file-browser.schemas
-%gconf_schema_uninstall gedit.schemas
+%glib_compile_schemas
 
 %postun
 /sbin/ldconfig
 %scrollkeeper_update_postun
 %update_desktop_database_postun
+%glib_compile_schemas
 
 %files -f gedit.lang
 %defattr(644,root,root,755)
 %doc README ChangeLog AUTHORS
-%{_sysconfdir}/gconf/schemas/gedit.schemas
-%{_sysconfdir}/gconf/schemas/gedit-file-browser.schemas
 %attr(755,root,root) %{_bindir}/gedit
 %attr(755,root,root) %{_bindir}/gnome-text-editor
-%dir %{_libdir}/gedit-2
-%dir %{_libdir}/gedit-2/plugin-loaders
-%attr(755,root,root) %{_libdir}/gedit-2/plugin-loaders/*.so
-%dir %{_libdir}/gedit-2/plugins
-%dir %{_libdir}/gedit-2/plugins/externaltools
-%dir %{_libdir}/gedit-2/plugins/pythonconsole
-%dir %{_libdir}/gedit-2/plugins/quickopen
-%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/*.py[co]
-%{_libdir}/gedit-2/plugins/*.gedit-plugin
-%{_libdir}/gedit-2/plugins/pythonconsole/*.py[co]
-%{_libdir}/gedit-2/plugins/quickopen/*.py[co]
-%{_libdir}/gedit-2/plugins/snippets/*.py[co]
-%{_datadir}/gedit-2
+%attr(755,root,root) %{_libdir}/libgedit-private.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgedit-private.so.0
+%dir %{_libdir}/gedit
+%dir %{_libdir}/gedit/plugins
+%attr(755,root,root) %{_libdir}/gedit/gedit-bugreport.sh
+%attr(755,root,root) %{_libdir}/gedit/plugins/*.so
+%{_libdir}/gedit/plugins/*.plugin
+%dir %{_libdir}/gedit/plugins/externaltools
+%{_libdir}/gedit/plugins/externaltools/*.py[co]
+%dir %{_libdir}/gedit/plugins/pythonconsole
+%{_libdir}/gedit/plugins/pythonconsole/*.py[co]
+%dir %{_libdir}/gedit/plugins/snippets
+%{_libdir}/gedit/plugins/snippets/*.py[co]
+%dir %{_libdir}/gedit/plugins/quickopen
+%{_libdir}/gedit/plugins/quickopen/*.py[co]
+%dir %{_libdir}/gedit/girepository-1.0
+%{_libdir}/gedit/girepository-1.0/Gedit-3.0.typelib
+%{_datadir}/gedit
+%{_datadir}/GConf/gsettings/gedit.convert
+%{_datadir}/dbus-1/services/org.gnome.gedit.service
+%{_datadir}/glib-2.0/schemas/org.gnome.gedit.enums.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.gedit.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.externaltools.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.filebrowser.enums.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.filebrowser.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.pythonconsole.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.time.enums.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.time.gschema.xml
 %{_desktopdir}/gedit.desktop
 %{_mandir}/man1/gedit.1*
+%{py_sitedir}/gi/overrides/*.py[co]
 
 %files devel
 %defattr(644,root,root,755)
-%{_includedir}/gedit-2.20
-%{_pkgconfigdir}/gedit-2.20.pc
+%attr(755,root,root) %{_libdir}/libgedit-private.so
+%{_includedir}/gedit-3.0
+%{_pkgconfigdir}/gedit.pc
 
 %files apidocs
 %defattr(644,root,root,755)
@@ -185,9 +194,27 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.148  2011/04/05 18:31:09  megabajt
+- updated to 3.0.0; merged from DEVEL
+
 Revision 1.147  2011/03/27 06:34:44  qboosh
 - en at shaw locale is now supported (via LANGUAGE)
 - use __rm macro
+
+Revision 1.146.2.5  2011/03/26 20:08:43  megabajt
+- updated to 2.91.11
+
+Revision 1.146.2.4  2011/03/22 21:54:49  megabajt
+- updated to 2.91.10
+
+Revision 1.146.2.3  2011/03/13 16:38:36  megabajt
+- build zeitgeist plugin
+
+Revision 1.146.2.2  2011/03/13 15:57:41  megabajt
+- updated to 2.91.9
+
+Revision 1.146.2.1  2011/03/07 21:27:22  wiget
+- up to 2.91.8
 
 Revision 1.146  2010/10/01 20:43:48  megabajt
 - updated to 2.30.4
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gedit2/gedit2.spec?r1=1.147&r2=1.148&f=u

More information about the pld-cvs-commit mailing list