Author: wiget Date: Mon Mar 7 21:27:28 2011 GMT Module: packages Tag: DEVEL ---- Log message: - up to 2.91.8
---- Files affected: packages/gedit2: gedit2.spec (1.146 -> 1.146.2.1) ---- Diffs: ================================================================ Index: packages/gedit2/gedit2.spec diff -u packages/gedit2/gedit2.spec:1.146 packages/gedit2/gedit2.spec:1.146.2.1 --- packages/gedit2/gedit2.spec:1.146 Fri Oct 1 22:43:48 2010 +++ packages/gedit2/gedit2.spec Mon Mar 7 22:27:22 2011 @@ -2,12 +2,12 @@ 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: 2.91.8 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/2.91/gedit-%{version}.tar.bz2 +# Source0-md5: d72bc4ce5267dd7f3cf404887ad9d37a URL: http://www.gnome.org/projects/gedit/ BuildRequires: GConf2-devel >= 2.24.0 BuildRequires: attr-devel @@ -19,9 +19,9 @@ BuildRequires: glib2-devel >= 1:2.24.0 BuildRequires: gnome-common >= 2.24.0 BuildRequires: gnome-doc-utils >= 0.14.0 -BuildRequires: gtk+2-devel >= 2:2.18.0 +BuildRequires: gtk+3-devel >= 3.0.2 BuildRequires: gtk-doc >= 1.8 -BuildRequires: gtksourceview2-devel >= 2.10.0 +BuildRequires: gtksourceview3-devel >= 2.10.0 BuildRequires: intltool >= 0.40.0 BuildRequires: iso-codes >= 0.35 BuildRequires: libsoup-devel @@ -29,20 +29,21 @@ BuildRequires: libxml2-devel >= 1:2.6.31 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: python-gtksourceview2-devel >= 2.10.0 +#BuildRequires: python-pygobject-devel >= 2.27.91 +#BuildRequires: python-pygtk-devel >= 2:2.12.0 BuildRequires: rpm-pythonprov BuildRequires: rpmbuild(find_lang) >= 1.23 BuildRequires: rpmbuild(macros) >= 1.197 BuildRequires: scrollkeeper >= 0.3.12 BuildRequires: sed >= 4.0 BuildRequires: xorg-lib-libSM-devel +BuildRequires: libpeas-devel >= 0.7.2 +BuildRequires: libpeas-gtk-devel >= 0.7.2 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 +Requires: libpeas-loader-python Suggests: python-vte Obsoletes: gedit-devel Obsoletes: gedit-plugins < 2.3.3-2 @@ -50,6 +51,8 @@ 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 @@ -91,10 +94,7 @@ %prep %setup -q -n gedit-%{version} sed -i 's/^en@shaw//' po/LINGUAS -rm po/e...@shaw.po - -sed -i 's/codegen.py/codegen.pyc/' configure.ac -sed -i 's/h2def.py/h2def.pyc/' configure.ac +%{__rm} po/e...@shaw.po %build %{__gtkdocize} @@ -105,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} @@ -117,13 +116,11 @@ rm -rf $RPM_BUILD_ROOT %{__make} install \ - DESTDIR=$RPM_BUILD_ROOT \ - GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 + DESTDIR=$RPM_BUILD_ROOT -# Remove obsoleted *.la files -rm -f $RPM_BUILD_ROOT%{_libdir}/gedit-2/{plugins,plugin-loaders}/*.la -rm -f $RPM_BUILD_ROOT%{_libdir}/gedit-2/plugins/*.py -rm -f $RPM_BUILD_ROOT%{_libdir}/gedit-2/plugins/*/*.py +%{__rm} $RPM_BUILD_ROOT%{_libdir}/gedit/plugins/*.la \ + $RPM_BUILD_ROOT%{_libdir}/gedit/plugins/*/*.py \ + $RPM_BUILD_ROOT%{_libdir}/*.la %find_lang gedit --with-gnome --with-omf @@ -132,15 +129,9 @@ %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 - %postun /sbin/ldconfig %scrollkeeper_update_postun @@ -149,33 +140,39 @@ %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.*.*.* +%ghost %{_libdir}/libgedit-private.so.0 +%dir %{_libdir}/gedit +%dir %{_libdir}/gedit/plugins +%dir %{_libdir}/gedit/plugins/pythonconsole +%dir %{_libdir}/gedit/plugins/quickopen +%attr(755,root,root) %{_libdir}/gedit/gedit-bugreport.sh +%attr(755,root,root) %{_libdir}/gedit/plugins/*.so +%{_libdir}/gedit/plugins/*.plugin +%{_libdir}/gedit/plugins/pythonconsole/*.py[co] +%{_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.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* %files devel %defattr(644,root,root,755) -%{_includedir}/gedit-2.20 -%{_pkgconfigdir}/gedit-2.20.pc +%{_libdir}/libgedit-private.so +%{_includedir}/gedit-3.0 +%{_pkgconfigdir}/gedit.pc %files apidocs %defattr(644,root,root,755) @@ -187,6 +184,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +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.146&r2=1.146.2.1&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
