This commit is contained in:
Matthias Clasen 2010-10-07 13:41:31 -04:00
parent e41fc19cf9
commit 91947c12b6
3 changed files with 16 additions and 53 deletions

1
.gitignore vendored
View File

@ -1,2 +1,3 @@
gedit-2.31.5.tar.bz2
gedit-2.31.6.tar.bz2
/gedit-2.91.0.tar.bz2

View File

@ -1,9 +1,6 @@
%define glib2_version 2.22.0
%define desktop_file_utils_version 0.9
%define gtksourceview_version 2.10.2
%define pygtk_version 2.12.0
%define pygobject_version 2.15.4
%define pygtksourceview_version 2.8.0
%define gtksourceview_version 2.91
%define gnome_python_desktop_version 2.15.90
%define gnome_doc_utils_version 0.3.2
%define enchant_version 1.2.0
@ -12,13 +9,13 @@
Summary: Text editor for the GNOME desktop
Name: gedit
Epoch: 2
Version: 2.31.6
Epoch: 1
Version: 2.91.0
Release: 4%{?dist}
License: GPLv2+ and GFDL
Group: Applications/Editors
#VCS: git:git://git.gnome.org/gedit
Source0: http://download.gnome.org/sources/gedit/2.31/gedit-%{version}.tar.bz2
Source0: http://download.gnome.org/sources/gedit/2.91/gedit-%{version}.tar.bz2
URL: http://projects.gnome.org/gedit/
@ -35,26 +32,21 @@ Patch1: gedit-2.13.90-libdir.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=587053
#Patch3: print-to-file.patch
# https://bugzilla.gnome.org/show_bug.cgi?id=619898
Patch4: gedit-gsettings-migration.patch
BuildRequires: gnome-common
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk2-devel
BuildRequires: gtk3-devel
BuildRequires: GConf2-devel
BuildRequires: libSM-devel
BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
BuildRequires: enchant-devel >= %{enchant_version}
BuildRequires: iso-codes-devel >= %{isocodes_version}
BuildRequires: libattr-devel
BuildRequires: gtksourceview2-devel >= %{gtksourceview_version}
BuildRequires: gtksourceview3-devel >= %{gtksourceview_version}
BuildRequires: scrollkeeper gettext
BuildRequires: pygtk2-devel >= %{pygtk_version}
BuildRequires: pygobject2-devel >= %{pygobject_version}
BuildRequires: pygtksourceview-devel >= %{pygtksourceview_version}
BuildRequires: python-devel
BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version}
BuildRequires: libpeas-devel >= %{libpeas_version}
BuildRequires: gsettings-desktop-schemas-devel
BuildRequires: which
BuildRequires: autoconf, automake, libtool
BuildRequires: intltool
@ -100,11 +92,9 @@ Install gedit-devel if you want to write plugins for gedit.
%endif
#%patch3 -p1 -b .print-to-file
%patch4 -p1 -b .gsettings-migration
aclocal
automake
autoconf
autoreconf -i -f
intltoolize -f
%build
%configure \
@ -113,19 +103,6 @@ autoconf
--disable-gtk-doc
make %{_smp_mflags}
# strip unneeded translations from .mo files
# ideally intltool (ha!) would do that for us
# http://bugzilla.gnome.org/show_bug.cgi?id=474987
cd po
grep -v ".*[.]desktop[.]in.*\|.*[.]server[.]in[.]in$" POTFILES.in > POTFILES.keep
mv POTFILES.keep POTFILES.in
intltool-update --pot
for p in *.po; do
msgmerge $p %{name}.pot > $p.out
msgfmt -o `basename $p .po`.gmo $p.out
done
cd ..
%install
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
make install DESTDIR=$RPM_BUILD_ROOT
@ -139,24 +116,6 @@ desktop-file-install --delete-original \
/bin/rm -f `find $RPM_BUILD_ROOT%{_libdir} -name "*.a"`
/bin/rm -f `find $RPM_BUILD_ROOT%{_libdir} -name "*.la"`
/bin/rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
# save space by linking identical images in translated docs
helpdir=$RPM_BUILD_ROOT%{_datadir}/gnome/help/%{name}
for f in $helpdir/C/figures/*.png; do
b="$(basename $f)"
for d in $helpdir/*; do
if [ -d "$d" -a "$d" != "$helpdir/C" ]; then
g="$d/figures/$b"
if [ -f "$g" ]; then
if cmp -s $f $g; then
rm "$g"; ln -s "../../C/figures/$b" "$g"
fi
fi
fi
done
done
%find_lang %{name} --with-gnome
%post
@ -190,9 +149,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
%{_datadir}/glib-2.0/schemas/org.gnome.gedit.enums.xml
%{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.filebrowser.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.filebrowser.enums.xml
%{_datadir}/glib-2.0/schemas/org.gnome.gedit.time.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.time.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.time.enums.xml
%{_datadir}/glib-2.0/schemas/org.gnome.gedit.pythonconsole.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.pythonconsole.gschema.xml
%{_datadir}/dbus-1/services/org.gnome.gedit.service
@ -206,6 +165,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
%changelog
* Thu Oct 7 2010 Matthias Clasen <mclasen@redhat.com> - 2:2.91.0-1
- Update to 2.91.0
* Mon Aug 23 2010 Matthias Clasen <mclasen@redhat.com> - 2:2.31.6-4
- Co-own /usr/share/gtk-doc

View File

@ -1 +1 @@
276f141c1c0694ec7b8c60e95408c218 gedit-2.31.6.tar.bz2
abc9ef8420c02b4622c8892d5cfd3ac6 gedit-2.91.0.tar.bz2