rpms/awn-extras-applets/devel awn-extras-applets-0.3.2.1-python-platform.patch, 1.2, 1.3 awn-extras-applets.spec, 1.20, 1.21
Sindre Pedersen Bjørdal
sindrepb at fedoraproject.org
Sun Apr 5 00:35:42 UTC 2009
Author: sindrepb
Update of /cvs/pkgs/rpms/awn-extras-applets/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20688
Modified Files:
awn-extras-applets-0.3.2.1-python-platform.patch
awn-extras-applets.spec
Log Message:
fix python on 64bit, for real, promise
awn-extras-applets-0.3.2.1-python-platform.patch:
Index: awn-extras-applets-0.3.2.1-python-platform.patch
===================================================================
RCS file: /cvs/pkgs/rpms/awn-extras-applets/devel/awn-extras-applets-0.3.2.1-python-platform.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- awn-extras-applets-0.3.2.1-python-platform.patch 2 Apr 2009 18:13:04 -0000 1.2
+++ awn-extras-applets-0.3.2.1-python-platform.patch 5 Apr 2009 00:35:41 -0000 1.3
@@ -1,6 +1,462 @@
+diff -up ./acinclude.m4.orig ./acinclude.m4
+--- ./acinclude.m4.orig 2009-04-03 22:45:50.000000000 +0200
++++ ./acinclude.m4 2009-04-03 22:48:32.000000000 +0200
+@@ -1,11 +1,404 @@
+-m4_include([m4/python.m4])
++dnl AC_PYTHON_DEVEL([version])
++dnl
++dnl Originally copied from http://autoconf-archive.cryp.to/ac_python_devel.html
++dnl (Original last modified 2007-07-31)
++dnl
++dnl Copyright © 2007 Sebastian Huber <sebastian-huber at web.de>
++dnl Copyright © 2007 Alan W. Irwin <irwin at beluga.phys.uvic.ca>
++dnl Copyright © 2007 Rafael Laboissiere <rafael at laboissiere.net>
++dnl Copyright © 2007 Andrew Collier <colliera at ukzn.ac.za>
++dnl Copyright © 2007 Matteo Settenvini <matteo at member.fsf.org>
++dnl Copyright © 2007 Horst Knorr <hk_classes at knoda.org>
++dnl
++dnl This program is free software: you can redistribute it and/or modify it
++dnl under the terms of the GNU General Public License as published by the Free
++dnl Software Foundation, either version 3 of the License, or (at your option)
++dnl any later version.
++dnl
++dnl This program is distributed in the hope that it will be useful, but WITHOUT
++dnl ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++dnl FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
++dnl more details.
++dnl
++dnl You should have received a copy of the GNU General Public License along with
++dnl this program. If not, see <http://www.gnu.org/licenses/>.
++dnl
++dnl As a special exception, the respective Autoconf Macro's copyright owner
++dnl gives unlimited permission to copy, distribute and modify the configure
++dnl scripts that are the output of Autoconf when processing the Macro. You need
++dnl not follow the terms of the GNU General Public License when using or
++dnl distributing such scripts, even though portions of the text of the Macro
++dnl appear in them. The GNU General Public License (GPL) does govern all other
++dnl use of the material that constitutes the Autoconf Macro.
++dnl
++dnl This special exception to the GPL applies to versions of the Autoconf Macro
++dnl released by the Autoconf Macro Archive. When you make and distribute a
++dnl modified version of the Autoconf Macro, you may extend this special
++dnl exception to the GPL to apply to your modified version as well.
++dnl
++AC_DEFUN([AC_PYTHON_DEVEL],[
++ #
++ # Allow the use of a (user set) custom python version
++ #
++ AC_ARG_VAR([PYTHON_VERSION],[The installed Python
++ version to use, for example '2.3'. This string
++ will be appended to the Python interpreter
++ canonical name.])
++
++ AC_PATH_PROG([PYTHON],[python[$PYTHON_VERSION]])
++ if test -z "$PYTHON"; then
++ AC_MSG_ERROR([Cannot find python$PYTHON_VERSION in your system path])
++ PYTHON_VERSION=""
++ fi
++
++ #
++ # Check for a version of Python >= 2.1.0
++ #
++ AC_MSG_CHECKING([for a version of Python >= 2.1.0])
++ ac_supports_python_ver=`$PYTHON -c "import sys, string; \
++ ver = string.split(sys.version)[[0]]; \
++ print ver >= '2.1.0'"`
++ if test "$ac_supports_python_ver" != "True"; then
++ if test -z "$PYTHON_NOVERSIONCHECK"; then
++ AC_MSG_RESULT([no])
++ AC_MSG_FAILURE([
++This version of the AC@&t at _PYTHON_DEVEL macro
++doesn't work properly with versions of Python before
++2.1.0. You may need to re-run configure, setting the
++variables PYTHON_CPPFLAGS, PYTHON_LDFLAGS, PYTHON_SITE_PKG,
++PYTHON_EXTRA_LIBS and PYTHON_EXTRA_LDFLAGS by hand.
++Moreover, to disable this check, set PYTHON_NOVERSIONCHECK
++to something else than an empty string.
++])
++ else
++ AC_MSG_RESULT([skip at user request])
++ fi
++ else
++ AC_MSG_RESULT([yes])
++ fi
++
++ #
++ # if the macro parameter ``version'' is set, honour it
++ #
++ if test -n "$1"; then
++ AC_MSG_CHECKING([for a version of Python >= $1])
++ ac_supports_python_ver=`$PYTHON -c "import sys, string; \
++ ver = string.split(sys.version)[[0]]; \
++ print ver >= '$1'"`
++ if test "$ac_supports_python_ver" = "True"; then
++ AC_MSG_RESULT([yes])
++ else
++ AC_MSG_RESULT([no])
++ AC_MSG_ERROR([this package requires Python $1.
++If you have it installed, but it isn't the default Python
++interpreter in your system path, please pass the PYTHON_VERSION
++variable to configure. See ``configure --help'' for reference.
++])
++ PYTHON_VERSION=""
++ fi
++ fi
++
++ #
++ # Check if you have distutils, else fail
++ #
++ AC_MSG_CHECKING([for the distutils Python package])
++ ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
++ if test -z "$ac_distutils_result"; then
++ AC_MSG_RESULT([yes])
++ else
++ AC_MSG_RESULT([no])
++ AC_MSG_ERROR([cannot import Python module "distutils".
++Please check your Python installation. The error was:
++$ac_distutils_result])
++ PYTHON_VERSION=""
++ fi
++
++ #
++ # Check for Python include path
++ #
++ AC_MSG_CHECKING([for Python include path])
++ if test -z "$PYTHON_CPPFLAGS"; then
++ python_path=`$PYTHON -c "import distutils.sysconfig; \
++ print distutils.sysconfig.get_python_inc();"`
++ if test -n "${python_path}"; then
++ python_path="-I$python_path"
++ fi
++ PYTHON_CPPFLAGS=$python_path
++ fi
++ AC_MSG_RESULT([$PYTHON_CPPFLAGS])
++ AC_SUBST([PYTHON_CPPFLAGS])
++
++ #
++ # Check for Python library path
++ #
++ AC_MSG_CHECKING([for Python library path])
++ if test -z "$PYTHON_LDFLAGS"; then
++ # (makes two attempts to ensure we've got a version number
++ # from the interpreter)
++ py_version=`$PYTHON -c "from distutils.sysconfig import *; \
++ from string import join; \
++ print join(get_config_vars('VERSION'))"`
++ if test "$py_version" == "[None]"; then
++ if test -n "$PYTHON_VERSION"; then
++ py_version=$PYTHON_VERSION
++ else
++ py_version=`$PYTHON -c "import sys; \
++ print sys.version[[:3]]"`
++ fi
++ fi
++
++ PYTHON_LDFLAGS=`$PYTHON -c "from distutils.sysconfig import *; \
++ from string import join; \
++ print '-L' + get_python_lib(0,1), \
++ '-lpython';"`$py_version
++ fi
++ AC_MSG_RESULT([$PYTHON_LDFLAGS])
++ AC_SUBST([PYTHON_LDFLAGS])
++
++ #
++ # Check for the site packages
++ #
++ AC_MSG_CHECKING([for Python site-packages path])
++ AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}'])
++ if test -z "$PYTHON_SITE_PKG"; then
++ PYTHON_SITE_PKG=`$PYTHON -c "import distutils.sysconfig; \
++ print distutils.sysconfig.get_python_lib(0,0,prefix='${PYTHON_EXEC_PREFIX}');"`
++ fi
++ AC_MSG_RESULT([$PYTHON_SITE_PKG])
++ AC_SUBST([PYTHON_SITE_PKG])
++
++ #
++ # Check for the platform-specific site packages directory
++ #
++ AC_MSG_CHECKING([for Python platform-specific site-packages path])
++ if test -z "$PYTHON_PLATFORM_PKG"; then
++ PYTHON_PLATFORM_PKG=`$PYTHON -c "import distutils.sysconfig; \
++ print distutils.sysconfig.get_python_lib(1,0,prefix='${PYTHON_EXEC_PREFIX}');"`
++ fi
++ AC_MSG_RESULT([$PYTHON_PLATFORM_PKG])
++ AC_SUBST([PYTHON_PLATFORM_PKG])
++
++ #
++ # libraries which must be linked in when embedding
++ #
++ AC_MSG_CHECKING(python extra libraries)
++ if test -z "$PYTHON_EXTRA_LIBS"; then
++ PYTHON_EXTRA_LIBS=`$PYTHON -c "import distutils.sysconfig; \
++ conf = distutils.sysconfig.get_config_var; \
++ print conf('LOCALMODLIBS'), conf('LIBS')"`
++ fi
++ AC_MSG_RESULT([$PYTHON_EXTRA_LIBS])
++ AC_SUBST(PYTHON_EXTRA_LIBS)
++
++ #
++ # linking flags needed when embedding
++ #
++ AC_MSG_CHECKING(python extra linking flags)
++ if test -z "$PYTHON_EXTRA_LDFLAGS"; then
++ PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "import distutils.sysconfig; \
++ conf = distutils.sysconfig.get_config_var; \
++ print conf('LINKFORSHARED')"`
++ fi
++ AC_MSG_RESULT([$PYTHON_EXTRA_LDFLAGS])
++ AC_SUBST(PYTHON_EXTRA_LDFLAGS)
++
++ #
++ # final check to see if everything compiles alright
++ #
++ AC_MSG_CHECKING([consistency of all components of python development environment])
++ AC_LANG_PUSH([C])
++ # save current global flags
++ LIBS="$ac_save_LIBS $PYTHON_LDFLAGS"
++ CPPFLAGS="$ac_save_CPPFLAGS $PYTHON_CPPFLAGS"
++ AC_TRY_LINK([
++ #include <Python.h>
++ ],[
++ Py_Initialize();
++ ],[pythonexists=yes],[pythonexists=no])
++
++ AC_MSG_RESULT([$pythonexists])
++
++ if test ! "$pythonexists" = "yes"; then
++ AC_MSG_ERROR([
++ Could not link test program to Python. Maybe the main Python library has been
++ installed in some non-standard library path. If so, pass it to configure,
++ via the LDFLAGS environment variable.
++ Example: ./configure LDFLAGS="-L/usr/non-standard-path/python/lib"
++ ============================================================================
++ ERROR!
++ You probably have to install the development version of the Python package
++ for your distribution. The exact name of this package varies among them.
++ ============================================================================
++ ])
++ PYTHON_VERSION=""
++ fi
++ AC_LANG_POP
++ # turn back to default flags
++ CPPFLAGS="$ac_save_CPPFLAGS"
++ LIBS="$ac_save_LIBS"
++
++ #
++ # all done!
++ #
++])
++
++dnl AM_CHECK_PYMOD(MODNAME [,SYMBOL [,ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]]])
++dnl Check if a module containing a given symbol is visible to python.
++AC_DEFUN([AM_CHECK_PYMOD],
++[AC_REQUIRE([AC_PYTHON_DEVEL])
++py_mod_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'`
++AC_MSG_CHECKING(for ifelse([$2],[],,[$2 in ])python module $1)
++AC_CACHE_VAL(py_cv_mod_$py_mod_var, [
++ifelse([$2],[], [prog="
++import sys
++try:
++ import $1
++except ImportError:
++ sys.exit(1)
++except:
++ sys.exit(0)
++sys.exit(0)"], [prog="
++import $1
++$1.$2"])
++if $PYTHON -c "$prog" 1>&AC_FD_CC 2>&AC_FD_CC
++ then
++ eval "py_cv_mod_$py_mod_var=yes"
++ else
++ eval "py_cv_mod_$py_mod_var=no"
++ fi
++])
++py_val=`eval "echo \`echo '$py_cv_mod_'$py_mod_var\`"`
++if test "x$py_val" != xno; then
++ AC_MSG_RESULT(yes)
++ ifelse([$3], [],, [$3
++])dnl
++else
++ AC_MSG_RESULT(no)
++ ifelse([$4], [],, [$4
++])dnl
++fi
++])
++
++dnl
++dnl JH_ADD_CFLAG(FLAG)
++dnl checks whether the C compiler supports the given flag, and if so, adds
++dnl it to $CFLAGS. If the flag is already present in the list, then the
++dnl check is not performed.
++AC_DEFUN([JH_ADD_CFLAG],
++[
++case " $CFLAGS " in
++*@<:@\ \ @:>@$1@<:@\ \ @:>@*)
++ ;;
++*)
++ save_CFLAGS="$CFLAGS"
++ CFLAGS="$CFLAGS $1"
++ AC_MSG_CHECKING([whether [$]CC understands $1])
++ AC_TRY_COMPILE([], [], [jh_has_option=yes], [jh_has_option=no])
++ AC_MSG_RESULT($jh_has_option)
++ if test $jh_has_option = no; then
++ CFLAGS="$save_CFLAGS"
++ fi
++ ;;
++esac])
++dnl AM_GCONF_SOURCE_2
++dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
++dnl (i.e. pass to gconftool-2
++dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where
++dnl you should install foo.schemas files
++dnl
++
++AC_DEFUN([AM_GCONF_SOURCE_2],
++[
++ if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
++ GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
++ else
++ GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
++ fi
++
++ AC_ARG_WITH(gconf-source,
++ [ --with-gconf-source=sourceaddress Config database for installing schema files.],GCONF_SCHEMA_CONFIG_SOURCE="$withval",)
+
++ AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
++ AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
++
++ if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
++ GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
++ fi
++
++ AC_ARG_WITH(gconf-schema-file-dir,
++ [ --with-gconf-schema-file-dir=dir Directory for installing schema files.],GCONF_SCHEMA_FILE_DIR="$withval",)
++
++ AC_SUBST(GCONF_SCHEMA_FILE_DIR)
++ AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
++
++ AC_ARG_ENABLE(schemas-install,
++ [ --disable-schemas-install Disable the schemas installation],
++ [case ${enableval} in
++ yes|no) ;;
++ *) AC_MSG_ERROR(bad value ${enableval} for --enable-schemas-install) ;;
++ esac])
++ AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
++])
++# vala.m4 serial 1 (vala @VERSION@)
++dnl Autoconf scripts for the Vala compiler
++dnl Copyright (C) 2007 Mathias Hasselmann
++dnl
++dnl This library is free software; you can redistribute it and/or
++dnl modify it under the terms of the GNU Lesser General Public
++dnl License as published by the Free Software Foundation; either
++dnl version 2 of the License, or (at your option) any later version.
++
++dnl This library is distributed in the hope that it will be useful,
++dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
++dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++dnl Lesser General Public License for more details.
++
++dnl You should have received a copy of the GNU Lesser General Public
++dnl License along with this library; if not, write to the Free Software
++dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
++dnl
++dnl Author:
++dnl Mathias Hasselmann <mathias.hasselmann at gmx.de>
++dnl --------------------------------------------------------------------------
++
++dnl VALA_PROG_VALAC([MINIMUM-VERSION])
++dnl
++dnl Check whether the Vala compiler exists in `PATH'. If it is found the
++dnl variable VALAC is set. Optionally a minimum release number of the compiler
++dnl can be requested.
++dnl --------------------------------------------------------------------------
++AC_DEFUN([VALA_PROG_VALAC],[
++ AC_PATH_PROG([VALAC], [valac], [])
++ AC_SUBST(VALAC)
++
++ if test -z "x${VALAC}"; then
++ AC_MSG_WARN([No Vala compiler found. You will not be able to recompile .vala source files.])
++ elif test -n "x$1"; then
++ AC_REQUIRE([AC_PROG_AWK])
++ AC_MSG_CHECKING([valac is at least version $1])
++
++ if "${VALAC}" --version | "${AWK}" -v r='$1' 'function vn(s) { if (3 == split(s,v,".")) return (v[1]*1000+v[2])*1000+v[3]; else exit 2; } /^Vala / { exit vn(r) > vn($[2]) }'; then
++ AC_MSG_RESULT([yes])
++ else
++ AC_MSG_RESULT([no])
++ AC_MSG_ERROR([Vala $1 not found.])
++ fi
++ fi
++])
++dnl as-ac-expand.m4 0.2.0 -*- autoconf -*-
++dnl autostars m4 macro for expanding directories using configure's prefix
++dnl
++dnl (C) 2003, 2004, 2005 Thomas Vander Stichele <thomas at apestaart dot org>
++dnl
++dnl Copying and distribution of this file, with or without modification,
++dnl are permitted in any medium without royalty provided the copyright
++dnl notice and this notice are preserved.
++dnl
+ dnl AS_AC_EXPAND(VAR, CONFIGURE_VAR)
+ dnl
+-dnl example
++dnl example:
+ dnl AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
+ dnl will set SYSCONFDIR to /usr/local/etc if prefix=/usr/local
+-
+ AC_DEFUN([AS_AC_EXPAND],
+ [
+ EXP_VAR=[$1]
+@@ -17,7 +410,7 @@ AC_DEFUN([AS_AC_EXPAND],
+
+ dnl if no prefix given, then use /usr/local, the default prefix
+ if test "x$prefix" = "xNONE"; then
+- prefix=$ac_default_prefix
++ prefix="$ac_default_prefix"
+ fi
+ dnl if no exec_prefix given, then use prefix
+ if test "x$exec_prefix" = "xNONE"; then
+@@ -28,7 +421,7 @@ AC_DEFUN([AS_AC_EXPAND],
+ dnl loop until it doesn't change anymore
+ while true; do
+ new_full_var="`eval echo $full_var`"
+- if test "x$new_full_var"="x$full_var"; then break; fi
++ if test "x$new_full_var" = "x$full_var"; then break; fi
+ full_var=$new_full_var
+ done
+
+@@ -40,3 +433,4 @@ AC_DEFUN([AS_AC_EXPAND],
+ prefix=$prefix_save
+ exec_prefix=$exec_prefix_save
+ ])
++
+diff -up ./configure.ac.orig ./configure.ac
+--- ./configure.ac.orig 2009-04-03 22:46:03.000000000 +0200
++++ ./configure.ac 2009-04-03 23:29:19.000000000 +0200
+@@ -38,6 +38,9 @@ dnl
+
+ AC_PYTHON_DEVEL()
+
++PLATFORM=`$PYTHON -c "from distutils import util; print util.get_platform()"`
++AC_SUBST(PLATFORM)
++
+ PKG_CHECK_MODULES(PYCAIRO, pycairo >= pycairo_required_version)
+ PYGTK_CODEGEN_DEFINES="-DHAVE_PYCAIRO $PYGTK_CODEGEN_DEFINES";
+
+@@ -252,6 +255,8 @@ AC_DEFINE_UNQUOTED(DBUS_API_SUBJECT_TO_C
+
+ appletsdir="$datarootdir/avant-window-navigator/applets"
+
++AS_AC_EXPAND([PY_SITE_PKG], [$PYTHON_SITE_PKG])
++AS_AC_EXPAND([PY_PLAT_PKG], [$PYTHON_PLATFORM_PKG])
+ AS_AC_EXPAND(APPLETSDIR, $appletsdir)
+ AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
+ AS_AC_EXPAND(LIBDIR, $libdir)
diff -up ./src/libawn-extras/bindings/python/Makefile.am.orig ./src/libawn-extras/bindings/python/Makefile.am
---- ./src/libawn-extras/bindings/python/Makefile.am.orig 2009-04-02 18:59:53.000000000 +0200
-+++ ./src/libawn-extras/bindings/python/Makefile.am 2009-04-02 19:40:14.000000000 +0200
+--- ./src/libawn-extras/bindings/python/Makefile.am.orig 2009-04-03 22:46:28.000000000 +0200
++++ ./src/libawn-extras/bindings/python/Makefile.am 2009-04-03 22:47:30.000000000 +0200
@@ -1,7 +1,7 @@
NULL =
@@ -20,17 +476,9 @@
common_ldflags = -module -avoid-version
diff -up ./src/libawn-extras/bindings/python/Makefile.in.orig ./src/libawn-extras/bindings/python/Makefile.in
---- ./src/libawn-extras/bindings/python/Makefile.in.orig 2009-04-02 18:59:58.000000000 +0200
-+++ ./src/libawn-extras/bindings/python/Makefile.in 2009-04-02 20:12:22.000000000 +0200
-@@ -246,6 +246,7 @@ PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDF
- PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@
- PYTHON_LDFLAGS = @PYTHON_LDFLAGS@
- PYTHON_SITE_PKG = @PYTHON_SITE_PKG@
-+PYTHON_PLATFORM_PKG = @PYTHON_PLATFORM_PKG@
- PYTHON_VERSION = @PYTHON_VERSION@
- RANLIB = @RANLIB@
- SED = @SED@
-@@ -331,7 +332,7 @@ top_srcdir = @top_srcdir@
+--- ./src/libawn-extras/bindings/python/Makefile.in.orig 2009-04-03 22:46:33.000000000 +0200
++++ ./src/libawn-extras/bindings/python/Makefile.in 2009-04-03 22:48:14.000000000 +0200
+@@ -331,7 +331,7 @@ top_srcdir = @top_srcdir@
NULL =
# awn python scripts
@@ -39,7 +487,7 @@
pyawn_extras_PYTHON = \
__init__.py \
awnlib.py \
-@@ -350,7 +351,7 @@ INCLUDES = \
+@@ -350,7 +350,7 @@ INCLUDES = \
# libawn-extras python extensions
Index: awn-extras-applets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/awn-extras-applets/devel/awn-extras-applets.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- awn-extras-applets.spec 2 Apr 2009 18:13:04 -0000 1.20
+++ awn-extras-applets.spec 5 Apr 2009 00:35:41 -0000 1.21
@@ -2,7 +2,7 @@
Name: awn-extras-applets
Version: 0.3.2.1
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Extras applets for avant window navigator
Group: User Interface/Desktops
@@ -14,6 +14,7 @@
BuildRequires: avant-window-navigator-devel >= 0.3.2
BuildRequires: libwnck-devel
+BuildRequires: libXres-devel
BuildRequires: libglade2-devel
BuildRequires: gnome-menus-devel
BuildRequires: gnome-desktop-devel
@@ -33,7 +34,11 @@
BuildRequires: libXcomposite-devel
BuildRequires: libtool
BuildRequires: intltool
+BuildRequires: vala-devel
+BuildRequires: WebKit-gtk-devel
#BuildRequires: gettext
+#required for autoreconf:
+BuildRequires: autoconf, automake
Requires: avant-window-navigator >= 0.3.2
Requires: gnome-python2-gnome
@@ -74,13 +79,11 @@
%setup -q
%patch0 -p1
-#for f in `find -name '*.py'`; do
-# head -n 1 $f | grep python && echo -e '1d\nwq' | ed $f
-#done
%build
-#./autogen.sh --disable-pymod-checks
-%configure --disable-static --disable-pymod-checks
+#required for python-platform patch
+autoreconf
+%configure --disable-static --disable-pymod-checks --with-webkit
make %{?_smp_mflags}
@@ -91,10 +94,6 @@
find ${RPM_BUILD_ROOT} -name '*.la' | xargs rm
-# resolve conflict
-# mv ${RPM_BUILD_ROOT}/etc/gconf/schemas/notification-daemon.schemas \
-# ${RPM_BUILD_ROOT}/etc/gconf/schemas/awn-notification-daemon.schemas
-
#%find_lang
#remove script-shebang in non-executables
@@ -176,10 +175,10 @@
%{_libdir}/pkgconfig/*
-
%changelog
-* Tue Apr 02 2009 Sindre Pedersen Bjørdal <sindrepb at fedoraproject.org> - 0.3.2.1-6
+* Tue Apr 02 2009 Sindre Pedersen Bjørdal <sindrepb at fedoraproject.org> - 0.3.2.1-7
- Add patch to fix build on x86_64
+- Enable webkit-gtk powered applets
* Tue Apr 02 2009 Sindre Pedersen Bjørdal <sindrepb at fedoraproject.org> - 0.3.2.1-4
- New upstream release
More information about the scm-commits
mailing list