|
|
@@ -24,10 +24,10 @@
|
|
|
##
|
|
|
|
|
|
# package version
|
|
|
-%define V_gtk 2.4.14
|
|
|
-%define V_gtk_major 2.4
|
|
|
-%define V_glib_major 2.4
|
|
|
-%define V_pango_major 1.4
|
|
|
+%define V_gtk 2.6.0
|
|
|
+%define V_gtk_major 2.6
|
|
|
+%define V_glib_major 2.6
|
|
|
+%define V_pango_major 1.8
|
|
|
%define V_atk_major 1.6
|
|
|
|
|
|
# package information
|
|
|
@@ -41,7 +41,7 @@ Class: PLUS
|
|
|
Group: XWindow
|
|
|
License: GPL
|
|
|
Version: %{V_gtk}
|
|
|
-Release: 20041203
|
|
|
+Release: 20041227
|
|
|
|
|
|
# list of sources
|
|
|
Source0: ftp://ftp.gtk.org/pub/gtk/v%{V_gtk_major}/gtk+-%{V_gtk}.tar.gz
|
|
|
@@ -87,7 +87,6 @@ AutoReqProv: no
|
|
|
# avoid searching for shared libraries
|
|
|
%{l_shtool} subst \
|
|
|
-e 's;echo eval echo \\\$export_dynamic_flag_spec;;g' \
|
|
|
- -e 's;echo eval echo \\\$lt_export_dynamic_flag_spec;;g' \
|
|
|
-e 's;^\(LIBS="-lintl\)\ *\($LIBS"\);\1 -liconv \2;g' \
|
|
|
configure
|
|
|
|
|
|
@@ -135,6 +134,11 @@ AutoReqProv: no
|
|
|
-e 's;\$(libdir)/locale;\$(datadir)/locale;' \
|
|
|
po/Makefile.in.in
|
|
|
|
|
|
+ # correct unnecessary and flawed dependency
|
|
|
+ %{l_shtool} subst \
|
|
|
+ -e 's;[a-zA-Z0-9$()-_/.]*libgdk_pixbuf-2.0.la *;;' \
|
|
|
+ modules/engines/pixbuf/Makefile.in
|
|
|
+
|
|
|
%build
|
|
|
# set x11 paths
|
|
|
xinc=`%{l_rc} --query x11_incdir`
|