From 9283a9969fc854b473df5ed86869e4b632e2669b Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: May 10 2006 01:57:54 +0000 Subject: 2.15.1 --- diff --git a/.cvsignore b/.cvsignore index e29a893..5c21070 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ gedit-2.15.1.tar.bz2 +po.tar.gz diff --git a/gedit-2.15.1-python.patch b/gedit-2.15.1-python.patch new file mode 100644 index 0000000..bdcaa48 --- /dev/null +++ b/gedit-2.15.1-python.patch @@ -0,0 +1,22 @@ +--- gedit-2.15.1/configure.ac.python 2006-04-24 14:07:25.000000000 -0400 ++++ gedit-2.15.1/configure.ac 2006-05-09 21:36:47.000000000 -0400 +@@ -116,10 +116,6 @@ + fi + + if test "x$have_python" != "xno"; then +- AM_CHECK_PYTHON_HEADERS([],[have_python=no]) +-fi +- +-if test "x$have_python" != "xno"; then + PY_PREFIX=`$PYTHON -c 'import sys ; print sys.prefix'` + PY_EXEC_PREFIX=`$PYTHON -c 'import sys ; print sys.exec_prefix'` + PYTHON_LIBS="-lpython$PYTHON_VERSION" +@@ -224,8 +220,6 @@ + dnl ================================================================ + AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal) + +-GNOME_COMPILE_WARNINGS(yes) +- + AC_ARG_ENABLE(deprecations, + [AC_HELP_STRING([--enable-deprecations], + [warn about deprecated usages [default=no]])],, diff --git a/gedit.spec b/gedit.spec index b8ed4b9..6a99002 100644 --- a/gedit.spec +++ b/gedit.spec @@ -22,6 +22,11 @@ Epoch: 1 License: GPL Group: Applications/Editors Source0: http://ftp.gnome.org/pub/GNOME/sources/gedit/2.8/gedit-%{version}.tar.bz2 + +# po/LINGUAS disaster +Source1: po.tar.gz +BuildRequires: intltool >= 0.34.90 + URL: http://gedit.sourceforge.net/ BuildRoot: %{_tmppath}/gedit-%{version}-root @@ -38,6 +43,10 @@ Patch0: gedit-2.13.2-filesel.patch Patch1: gedit-2.13.90-libdir.patch %endif +# po/LINGUAS disaster forces us to regenerate configure +# and I needed this patch to make autoconf happy +Patch2: gedit-2.15.1-python.patch + BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: pango-devel >= %{pango_version} BuildRequires: gtk2-devel >= %{gtk2_version} @@ -88,13 +97,22 @@ Install gedit-devel if you want to write plug-ins for gEdit. %prep %setup -n gedit-%{version} -q +tar xzf %{SOURCE1} %patch0 -p1 -b .filesel %ifarch ppc64,x86_64,ia64,s390x %patch1 -p1 -b .libdir %endif +%patch2 -p1 -b .python + %build +# full automadness due to intltool breakage +intltoolize --force +aclocal +automake +autoheader +autoconf %configure --disable-scrollkeeper --enable-python make @@ -153,7 +171,6 @@ fi %defattr(-, root, root) %doc README COPYING ChangeLog TODO AUTHORS %{_datadir}/gedit-2 -%{_datadir}/pixmaps %{_datadir}/gnome %{_datadir}/omf %{_datadir}/applications diff --git a/sources b/sources index 2fdba6c..5c56b1d 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 891084f0dd8880a24ca8d5108b9ee13a gedit-2.15.1.tar.bz2 +e9a143903e081bf09166db9a25ae0599 po.tar.gz