Accepting request 67371 from GNOME:Next

thanks

OBS-URL: https://build.opensuse.org/request/show/67371
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gedit?expand=0&rev=78

gedit-2.30.4.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a561fe3dd1d199baede1bd07c4ee65f06fc7c494dd4d3327117f04149a608e3c
-size 4705692

gedit-3.0.0.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a3a14d2f239f43f043743bc526f89c84bfb1ce55096b7629f905947948959f5e
+size 3606385

gedit.changes

@@ -1,3 +1,71 @@
+-------------------------------------------------------------------
+Tue Apr  5 14:13:35 UTC 2011 - fcrozat@novell.com
+
+- Update to version 3.0.0:
+  + Misc bugfixes
+  + Updated translations.
+
+-------------------------------------------------------------------
+Mon Mar 28 16:17:25 UTC 2011 - fcrozat@novell.com
+
+- Update to version 2.91.11:
+  + Resurrect the plugin message bus
+  + More improvements in the new user help
+  + Misc bugfixes
+  + Updated translations.
+- Changes from version 2.91.10:
+  + More improvements in the new user help
+  + Misc bugfixes
+- Changes from version 2.91.9:
+  + More improvements in the new user help
+  + Reactivate external tools and snippets plugins
+  + Misc bugfixes
+- Changes from version 2.91.8:
+  + Help has been ported to mallard format
+  + Improvements in the overlay
+  + Misc bugfixes
+- Changes from version 2.91.7:
+  + Improvements in the overlay
+  + Misc bugfixes
+- Changes from version 2.91.6:
+  + Fix encoding conversion
+  + Add invalid char support
+  + More plugins ported to pygobject
+  + Misc bugfixes
+- Changes from version 2.91.5:
+  + Misc bugfixes
+- Changes from version 2.91.4:
+  + Port snippets plugin to libpeas/gtk3
+  + Misc bugfixes
+- Changes from version 2.91.3:
+  + Misc bugfixes
+- Changes from version 2.91.2:
+  + Fix conversion of line endings when loading a file
+  + Update to the latest Gtk3 api changes
+  + Move the taglist plugin to the gedit-plugins package
+  + Misc bugfixes
+- Changes from version 2.91.1:
+  + Use native GtkNotebook DnD implementation
+  + Update to the latest Gtk3 api changes
+  + Misc bugfixes
+- Changes from version 2.91.0:
+  + New reworked search dialog
+  + Added mallard snippets
+  + Updated translations.
+- Changes from version 2.90.0:
+  + Add GSettings migration file
+  + Misc bugfixes
+- Change old-style buildRequires to new pkgconfig()/GNOME3 ones:
+  gtksourceview-devel, gconf2-devel, python-devel,
+  python-gobject2-devel, python-gtk-devel,
+  python-gtksourceview-devel to gtksourceview-3.0, libpeas-gtk-1.0,
+  gsettings-desktop-schemas, libsoup-2.4.
+- Replace GConf2 schemas handling with GSettings schemas handling.
+- Requires python-gobject instead of python-gnome / python-gobject2
+  / python-gtk / python-gtksourceview, thanks to introspection
+  based python binding.
+- Fix Obsoletes for gedit-doc (strict version obsolete)
+
 -------------------------------------------------------------------
 Fri Feb 18 13:56:50 UTC 2011 - gber@opensuse.org
 

gedit.spec

@@ -18,9 +18,8 @@
 
 
 Name:           gedit
-Version:        2.30.4
+Version:        3.0.0
-Release:        7
+Release:        1
-# NOTE: on upgrade to a new upstream version, change the doc Obsoletes from <= to <
 License:        GPLv2+
 Summary:        Small and lightweight UTF-8 text editor
 Url:            http://www.gnome.org
@@ -30,29 +29,24 @@ Source:         ftp://ftp.gnome.org/pub/gnome/sources/gedit/2.25/%{name}-%{versi
 Patch0:         gedit-desktop.patch
 BuildRequires:  enchant-devel
 BuildRequires:  fdupes
-BuildRequires:  gconf2-devel
 BuildRequires:  gettext
 BuildRequires:  gnome-doc-utils-devel
 BuildRequires:  gtk-doc
-BuildRequires:  gtksourceview-devel
+BuildRequires:  pkgconfig(gtksourceview-3.0)
+BuildRequires:  pkgconfig(libpeas-gtk-1.0)
+BuildRequires:  pkgconfig(gsettings-desktop-schemas)
+BuildRequires:  pkgconfig(libsoup-2.4)
+BuildRequires:  pkgconfig(pygobject-2.0)
 BuildRequires:  intltool
 BuildRequires:  iso-codes-devel
-BuildRequires:  python
-BuildRequires:  python-devel
-BuildRequires:  python-gobject2-devel
-BuildRequires:  python-gtk-devel
-BuildRequires:  python-gtksourceview-devel
 BuildRequires:  translation-update-upstream
 BuildRequires:  update-desktop-files
-Requires:       python-gnome
+Requires:       python-gobject
-Requires:       python-gobject2
-Requires:       python-gtk
-Requires:       python-gtksourceview
 Recommends:     %{name}-lang
 Provides:       gedit2 = %{version}
 Obsoletes:      gedit2 < %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%gconf_schemas_prereq
+%glib2_gsettings_schema_requires
 
 %description
 Gedit is a small and lightweight UTF-8 text editor for the GNOME
@@ -67,8 +61,7 @@ Requires:       gtksourceview-devel
 Provides:       gedit2-devel = %{version}
 Obsoletes:      gedit2-devel < %{version}
 Provides:       %{name}-doc = %{version}
-# Note: we keep <= (and a rpmlint warning...) until we get a version higher than 2.30.4 (when this provides/obsoletes was introduced)
+Obsoletes:      %{name}-doc < %{version}
-Obsoletes:      %{name}-doc <= %{version}
 
 %description devel
 Gedit is a small and lightweight UTF-8 text editor for the GNOME
@@ -84,53 +77,56 @@ translation-update-upstream
 %configure \
     --disable-scrollkeeper \
     --enable-python
-make %{?jobs:-j%jobs}
+make %{?jobs:-j%jobs} V=1
 
 %install
 %makeinstall
-%if 0%{?suse_version} <= 1110
-%{__rm} %{buildroot}%{_datadir}/locale/la/LC_MESSAGES/*
-%endif
-%if 0%{?suse_version} <= 1120
-%{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/*
-%endif
 %suse_update_desktop_file -N gedit -G "Text Editor" gedit TextEditor
 %find_lang %{name} %{?no_lang_C}
-%find_gconf_schemas
 rm %{buildroot}%{_libdir}/*/*/*.*a
+rm %{buildroot}%{_libdir}/*.la
 %fdupes %{buildroot}
 
 %clean
 rm -rf %{buildroot}
 
-%pre -f %{name}.schemas_pre
-
 %post
+/sbin/ldconfig
 %desktop_database_post
+%glib2_gsettings_schema_post
 
-%posttrans -f %{name}.schemas_posttrans
-
-%preun -f %{name}.schemas_preun
 
 %postun
+/sbin/ldconfig
 %desktop_database_postun
+%glib2_gsettings_schema_postun
 
-%files -f %{name}.schemas_list
+%files
 %defattr(-, root, root)
 %doc AUTHORS BUGS ChangeLog COPYING MAINTAINERS NEWS README
 %dir %{_datadir}/gnome/
 %dir %{_datadir}/gnome/help/
 %dir %{_datadir}/gnome/help/%{name}/
 %doc %{_datadir}/gnome/help/%{name}/C/
-%dir %{_datadir}/omf/
-%dir %{_datadir}/omf/%{name}/
-%doc %{_datadir}/omf/%{name}/%{name}-C.omf
 %{_bindir}/gedit
 %{_bindir}/gnome-text-editor
 %{_datadir}/applications/*.desktop
-%{_datadir}/gedit-2
+%{_datadir}/gedit
-%{_libdir}/gedit-2
+%{_datadir}/dbus-1/services/org.gnome.gedit.service
-%{_libexecdir}/gedit-2
+%{_datadir}/GConf/gsettings/gedit.convert
+%{_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
+
+%{_libdir}/libgedit-private.so.0*
+%{py_sitedir}/gi/overrides/Gedit.py*
+%{_libdir}/gedit
+%{_libexecdir}/gedit
 %doc %{_mandir}/man1/gedit*
 
 %files lang -f %{name}.lang
@@ -140,5 +136,6 @@ rm -rf %{buildroot}
 %doc %{_datadir}/gtk-doc/html/gedit/
 %{_includedir}/*
 %{_libdir}/pkgconfig/*.pc
+%{_libdir}/libgedit-private.so
 
 %changelog