Author: baggins Date: Fri Jun 29 11:23:07 2012 GMT Module: packages Tag: HEAD ---- Log message: - we have python lib in libdir so don't try to 'find /usr'
---- Files affected: packages/planner: planner.spec (1.53 -> 1.54) , pythonlib-in-libdir.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/planner/planner.spec diff -u packages/planner/planner.spec:1.53 packages/planner/planner.spec:1.54 --- packages/planner/planner.spec:1.53 Fri Jun 29 12:18:39 2012 +++ packages/planner/planner.spec Fri Jun 29 13:23:01 2012 @@ -9,12 +9,13 @@ Summary(pt_BR.UTF-8): Planner é um programa para gerenciamento de projetos Name: planner Version: 0.14.6 -Release: 1 +Release: 1.1 License: GPL v2+ Group: X11/Applications Source0: http://ftp.gnome.org/pub/GNOME/sources/planner/0.14/%{name}-%{version}.tar.xz # Source0-md5: 605c589f2c9ec695df0ae79aed3e2e3b Patch0: %{name}-desktop.patch +Patch1: pythonlib-in-libdir.patch URL: https://live.gnome.org/Planner/ BuildRequires: GConf2-devel >= 2.18.0.1 BuildRequires: autoconf >= 2.54 @@ -130,6 +131,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build cp -f /usr/share/automake/config.sub . @@ -248,6 +250,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.54 2012/06/29 11:23:01 baggins +- we have python lib in libdir so don't try to 'find /usr' + Revision 1.53 2012/06/29 10:18:39 baggins - working URL ================================================================ Index: packages/planner/pythonlib-in-libdir.patch diff -u /dev/null packages/planner/pythonlib-in-libdir.patch:1.1 --- /dev/null Fri Jun 29 13:23:07 2012 +++ packages/planner/pythonlib-in-libdir.patch Fri Jun 29 13:23:01 2012 @@ -0,0 +1,23 @@ +--- planner-0.14.6/acinclude.m4~ 2012-06-29 12:24:57.624058740 +0200 ++++ planner-0.14.6/acinclude.m4 2012-06-29 12:26:48.137388173 +0200 +@@ -83,19 +83,5 @@ + $2]) + CPPFLAGS="$save_CPPFLAGS" + +- # Check for Python library path +- AC_MSG_CHECKING([for Python library path]) +- python_path=`echo $PYTHON | sed "s,/bin.*$,,"` +- for i in "$python_path/lib/python$PYTHON_VERSION/config/" "$python_path/lib/python$PYTHON_VERSION/" "$python_path/lib/python/config/" "$python_path/lib/python/" "$python_path/" ; do +- python_path=`find $i -type f -name libpython$PYTHON_VERSION.* -print | sed "1q"` +- if test -n "$python_path" ; then +- break +- fi +- done +- python_path=`echo $python_path | sed "s,/libpython.*$,,"` +- AC_MSG_RESULT([$python_path]) +- if test -z "$python_path" ; then +- AC_MSG_ERROR([cannot find Python library path]) +- fi +- AC_SUBST([PYTHON_LDFLAGS],["-L$python_path -lpython$PYTHON_VERSION"]) ++ AC_SUBST([PYTHON_LDFLAGS],["-lpython$PYTHON_VERSION"]) + ]) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/packages/planner/planner.spec?r1=1.53&r2=1.54 _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
