rpms/awn-extras-applets/F-10 awn-extras-applets-0.3.2.1-python-platform.patch, NONE, 1.1 awn-extras-applets.spec, 1.10, 1.11 sources, 1.4, 1.5
Sindre Pedersen Bjørdal
sindrepb at fedoraproject.org
Tue Apr 7 11:16:30 UTC 2009
- Previous message (by thread): rpms/gcx/devel gcx.spec,1.6,1.7
- Next message (by thread): rpms/redir/F-11 01_fix_max_bandwidth_docs.dpatch, NONE, 1.1 02_use_ntohs.dpatch, NONE, 1.1 03_fix_tcp_wrappers.dpatch, NONE, 1.1 04_fix_timeouts.dpatch, NONE, 1.1 05_pedantic.dpatch, NONE, 1.1 06_fix_shaper_buffer.dpatch, NONE, 1.1 07_cosmetics.dpatch, NONE, 1.1 08_add_wrappers.dpatch, NONE, 1.1 09_add_linux_software_map.dpatch, NONE, 1.1 15_deb_cosmetics.dpatch, NONE, 1.1 20_do_not_strip.dpatch, NONE, 1.1 25_fix_setsockopt.dpatch, NONE, 1.1 30_fix_manpage.dpatch, NONE, 1.1 31_fix_transproxy_location.patch, NONE, 1.1 import.log, NONE, 1.1 redir.spec, NONE, 1.1 redir_gcc4.4-signedness.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: sindrepb
Update of /cvs/pkgs/rpms/awn-extras-applets/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20231
Modified Files:
awn-extras-applets.spec sources
Added Files:
awn-extras-applets-0.3.2.1-python-platform.patch
Log Message:
new upstream release, fixes
awn-extras-applets-0.3.2.1-python-platform.patch:
--- NEW FILE awn-extras-applets-0.3.2.1-python-platform.patch ---
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-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 =
# awn python scripts
-pyawn_extrasdir = $(PYTHON_SITE_PKG)/awn/extras
+pyawn_extrasdir = $(PYTHON_PLATFORM_PKG)/awn/extras
pyawn_extras_PYTHON = \
__init__.py \
awnlib.py \
@@ -19,7 +19,7 @@ INCLUDES = \
$(NULL)
# libawn-extras python extensions
-pyawn_extrasexecdir = $(PYTHON_SITE_PKG)/awn/extras
+pyawn_extrasexecdir = $(PYTHON_PLATFORM_PKG)/awn/extras
pyawn_extrasexec_LTLIBRARIES = _extras.la
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-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
-pyawn_extrasdir = $(PYTHON_SITE_PKG)/awn/extras
+pyawn_extrasdir = $(PYTHON_PLATFORM_PKG)/awn/extras
pyawn_extras_PYTHON = \
__init__.py \
awnlib.py \
@@ -350,7 +350,7 @@ INCLUDES = \
# libawn-extras python extensions
-pyawn_extrasexecdir = $(PYTHON_SITE_PKG)/awn/extras
+pyawn_extrasexecdir = $(PYTHON_PLATFORM_PKG)/awn/extras
pyawn_extrasexec_LTLIBRARIES = _extras.la
common_ldflags = -module -avoid-version
AWN_EXTRAS_DEFS = awn_extras.defs
Index: awn-extras-applets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/awn-extras-applets/F-10/awn-extras-applets.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- awn-extras-applets.spec 25 Aug 2008 22:13:55 -0000 1.10
+++ awn-extras-applets.spec 7 Apr 2009 11:15:59 -0000 1.11
@@ -1,18 +1,22 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+
Name: awn-extras-applets
-Version: 0.2.6
-Release: 6%{?dist}
+Version: 0.3.2.1
+Release: 7%{?dist}
Summary: Extras applets for avant window navigator
Group: User Interface/Desktops
License: GPLv2+
URL: https://launchpad.net/awn-extras/
-Source0: https://edge.launchpad.net/awn-extras/0.2/%{version}/+download/%{name}-%{version}.tar.gz
+Source0: https://edge.launchpad.net/awn-extras/0.3/%{version}/+download/%{name}-%{version}.tar.gz
+#patch modifies autotools files to make python bindings install to sitearch
+#requires autoreconf to take effect.
+Patch0: %{name}-%{version}-python-platform.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: avant-window-navigator-devel >= 0.2.6
+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
@@ -25,13 +29,19 @@
BuildRequires: libsexy-devel
BuildRequires: libnotify-devel
BuildRequires: perl(XML::Parser)
-BuildRequires: ed
BuildRequires: pycairo-devel
BuildRequires: pygtk2-devel
BuildRequires: vte-devel
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.2.6
+Requires: avant-window-navigator >= 0.3.2
Requires: gnome-python2-gnome
Requires: gnome-python2-gnomedesktop
Requires: gnome-python2-gnomevfs
@@ -56,14 +66,26 @@
%description
awn-extras-applets includes extras applets of Avant Window Navigator (Awn).
+%package devel
+Summary: Development files for %{name}
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description devel
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
+
+
%prep
%setup -q
-#for f in `find -name '*.py'`; do
-# head -n 1 $f | grep python && echo -e '1d\nwq' | ed $f
-#done
+%patch0 -p1
+
%build
-%configure --disable-static --disable-pymod-checks
+#required for python-platform patch
+libtoolize --force
+autoreconf
+%configure --disable-static --disable-pymod-checks --with-webkit
make %{?_smp_mflags}
@@ -74,15 +96,23 @@
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
+#translations included in non-standard way. no find_lang for now
+#%find_lang
+
+#remove script-shebang in non-executables
+stripscript()
+{
+ sed '1d' "$1" > "${1}_"
+ mv -f "${1}_" "$1"
+}
+for f in `find $RPM_BUILD_ROOT%{_datadir}/avant-window-navigator/applets/ -name *.py ! -executable`
+ do stripscript $f
+done
+stripscript $RPM_BUILD_ROOT%{python_sitearch}/awn/extras/detach.py
-# This project does not have translations
-# %find_lang %{name}
%pre
-SCHEMAS="awn-notification-daemon awn-terminal places switcher awnsystemmonitor filebrowser shinyswitcher trash"
+SCHEMAS="arss awn-notification-daemon awnsystemmonitor awnterm cairo-clock DesktopManager digitalClock file-browser-launcher filebrowser places pynot-rgba pynot shinyswitcher to-do trash"
if [ "$1" -gt 1 ]; then
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
for name in ${SCHEMAS}; do
@@ -92,15 +122,20 @@
fi
%post
-SCHEMAS="awn-notification-daemon awn-terminal places switcher awnsystemmonitor filebrowser shinyswitcher trash"
+SCHEMAS="arss awn-notification-daemon awnsystemmonitor awnterm cairo-clock DesktopManager digitalClock file-browser-launcher filebrowser places pynot-rgba pynot shinyswitcher to-do trash"
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
for name in ${SCHEMAS}; do
gconftool-2 --makefile-install-rule \
%{_sysconfdir}/gconf/schemas/${name}.schemas > /dev/null || :
done
+/sbin/ldconfig
+
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+
%preun
-SCHEMAS="awn-notification-daemon awn-terminal places switcher awnsystemmonitor filebrowser shinyswitcher trash"
+SCHEMAS="arss awn-notification-daemon awnsystemmonitor awnterm cairo-clock DesktopManager digitalClock file-browser-launcher filebrowser places pynot-rgba pynot shinyswitcher to-do trash"
if [ "$1" -eq 0 ]; then
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
for name in ${SCHEMAS}; do
@@ -109,28 +144,64 @@
done
fi
+%postun
+/sbin/ldconfig
+
+if [ $1 -eq 0 ] ; then
+ touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+
%clean
rm -rf $RPM_BUILD_ROOT
-%files
+%files
%defattr(-,root,root,-)
-%doc COPYING
+%doc ChangeLog COPYING README
%config(noreplace) %{_sysconfdir}/gconf/schemas/*
-%{_bindir}/affinity-preferences
-%{_libdir}/libawn-extras.so*
-%{python_sitelib}/awn/extras/*
-%dir %{python_sitelib}/awn/extras
-%{_includedir}/libawn-extras
-
-%{_libdir}/awn/applets/*
-
-%{_datadir}/icons
-%{_datadir}/avant-window-navigator/applets/icons
-%{_datadir}/avant-window-navigator/defs/awn_extras.defs
-%dir %{_datadir}/awn-extras-applets
-%{_datadir}/awn-extras-applets/*
+%{_libdir}/libawn-extras.so.*
+%{_libdir}/awn
+%{python_sitearch}/awn/extras
+%{_datadir}/icons/hicolor/*/apps/*
+%{_datadir}/avant-window-navigator/applets/*
+%{_datadir}/avant-window-navigator/defs/*
+
+%files devel
+%defattr(-,root,root,-)
+%doc COPYING
+%{_includedir}/*
+%{_libdir}/*.so
+%{_libdir}/pkgconfig/*
+
%changelog
+* 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
+- Add devel package
+- Update schemas scriplets
+- Fix rpmlint warnings about non-executable scripts
+- Add gnome-icon-cache scriplet
+- Add shared library scriplet
+- clean up files list
+- Use python_sitearch, not sitelib as package is arch.
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.6-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Tue Jan 06 2009 Caolán McNamara <caolanm at redhat.com> - 0.2.6-8
+- Resolves: rhbz#478696 make build again
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.2.6-7
+- Rebuild for Python 2.6
+
* Thu Aug 26 2008 Huang Peng <phuang at redhat.com> - 0.2.6-6
- Replace require gnome-python2 with gnome-python2-gnome
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/awn-extras-applets/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 17 Mar 2008 06:15:46 -0000 1.4
+++ sources 7 Apr 2009 11:15:59 -0000 1.5
@@ -1 +1 @@
-a02a7d82f086db96bca35d7865d2fa03 awn-extras-applets-0.2.6.tar.gz
+54f975f4a9a0798b5cce1b3239ed7b96 awn-extras-applets-0.3.2.1.tar.gz
- Previous message (by thread): rpms/gcx/devel gcx.spec,1.6,1.7
- Next message (by thread): rpms/redir/F-11 01_fix_max_bandwidth_docs.dpatch, NONE, 1.1 02_use_ntohs.dpatch, NONE, 1.1 03_fix_tcp_wrappers.dpatch, NONE, 1.1 04_fix_timeouts.dpatch, NONE, 1.1 05_pedantic.dpatch, NONE, 1.1 06_fix_shaper_buffer.dpatch, NONE, 1.1 07_cosmetics.dpatch, NONE, 1.1 08_add_wrappers.dpatch, NONE, 1.1 09_add_linux_software_map.dpatch, NONE, 1.1 15_deb_cosmetics.dpatch, NONE, 1.1 20_do_not_strip.dpatch, NONE, 1.1 25_fix_setsockopt.dpatch, NONE, 1.1 30_fix_manpage.dpatch, NONE, 1.1 31_fix_transproxy_location.patch, NONE, 1.1 import.log, NONE, 1.1 redir.spec, NONE, 1.1 redir_gcc4.4-signedness.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list