Author: wiget Date: Fri Dec 31 15:03:27 2010 GMT Module: packages Tag: HEAD ---- Log message: - fix building python support on amd64 - fix loading libraries on amd64 - release 5
---- Files affected: packages/glade3: glade3.spec (1.38 -> 1.39) , lib64.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/glade3/glade3.spec diff -u packages/glade3/glade3.spec:1.38 packages/glade3/glade3.spec:1.39 --- packages/glade3/glade3.spec:1.38 Fri Jul 9 12:09:31 2010 +++ packages/glade3/glade3.spec Fri Dec 31 16:03:22 2010 @@ -3,11 +3,12 @@ Summary(pl.UTF-8): Budowniczy interfejsów dla GTK+ i GNOME Name: glade3 Version: 3.6.7 -Release: 4 +Release: 5 License: GPL v2+3B Group: X11/Applications Source0: http://ftp.gnome.org/pub/GNOME/sources/glade3/3.6/%{name}-%{version}.tar.bz2 # Source0-md5: 0fbe06e4babb2adeaf9725577ff43395 +Patch0: lib64.patch URL: http://glade.gnome.org/ BuildRequires: autoconf >= 2.59-9 BuildRequires: automake >= 1:1.9 @@ -94,6 +95,7 @@ %prep %setup -q +%patch0 -p1 %build %{__gtkdocize} @@ -103,6 +105,8 @@ %{__autoheader} %{__automake} %configure \ + PYTHON_LIBS="-lpython" \ + PYTHON_LIB_LOC="%{_libdir}" \ --enable-gtk-doc \ --enable-user-manual \ --with-html-dir=%{_gtkdocdir} \ @@ -176,6 +180,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.39 2010/12/31 15:03:22 wiget +- fix building python support on amd64 +- fix loading libraries on amd64 +- release 5 + Revision 1.38 2010/07/09 10:09:31 arekm - release 4 ================================================================ Index: packages/glade3/lib64.patch diff -u /dev/null packages/glade3/lib64.patch:1.1 --- /dev/null Fri Dec 31 16:03:27 2010 +++ packages/glade3/lib64.patch Fri Dec 31 16:03:22 2010 @@ -0,0 +1,23 @@ +--- glade3-3.6.7/configure.ac.wiget 2010-12-31 15:33:50.326562908 +0100 ++++ glade3-3.6.7/configure.ac 2010-12-31 15:51:21.633744170 +0100 +@@ -249,6 +249,9 @@ AC_SUBST([AM_CFLAGS]) + AC_SUBST([AM_CXXFLAGS]) + AC_SUBST([AM_LDFLAGS]) + ++LIB="$(basename $libdir)" ++AC_DEFINE_UNQUOTED([LIB],["$LIB"],[libdir basename]) ++ + AC_CONFIG_FILES([ + Makefile + data/gladeui-1.0.pc +--- glade3-3.6.7/gladeui/glade-utils.c.wiget 2010-12-31 15:30:35.934282540 +0100 ++++ glade3-3.6.7/gladeui/glade-utils.c 2010-12-31 15:31:41.439362633 +0100 +@@ -1473,7 +1473,7 @@ GModule * + glade_util_load_library (const gchar *library_name) + { + GModule *module = NULL; +- const gchar *default_paths[] = { glade_app_get_modules_dir (), "/lib", "/usr/lib", "/usr/local/lib", NULL }; ++ const gchar *default_paths[] = { glade_app_get_modules_dir (), "/" LIB, "/usr/" LIB, "/usr/local/" LIB, NULL }; + const gchar *search_path; + gchar **split; + gint i; ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/glade3/glade3.spec?r1=1.38&r2=1.39&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
