|
|
@@ -1,6 +1,6 @@
|
|
|
%define emacsversion 24.0.93
|
|
|
#% define bzrdate 20110817
|
|
|
-%define emacsrelease 1%{?bzrdate:.%bzrdate}%{?_dist_release}
|
|
|
+%define emacsrelease 2%{?bzrdate:.%bzrdate}%{?_dist_release}
|
|
|
%define vine_default_major_version %(echo %_dist_release|%__sed s/vl//)
|
|
|
|
|
|
%define _noVersionedDependencies 1
|
|
|
@@ -77,7 +77,12 @@ BuildRequires: atk-devel
|
|
|
BuildRequires: dbus-devel GConf2-devel
|
|
|
BuildRequires: alsa-lib-devel
|
|
|
BuildRequires: gnutls-devel
|
|
|
-BuildRequires: gtk3-devel, cairo-devel
|
|
|
+%if %{?_dist_release} >= "vl7"
|
|
|
+BuildRequires: gtk3-devel
|
|
|
+%else
|
|
|
+BuildRequires: gtk2-devel
|
|
|
+%endif
|
|
|
+BuildRequires: cairo-devel
|
|
|
BuildRequires: freetype2-devel, fontconfig-devel
|
|
|
BuildRequires: libpng-devel, libjpeg-devel, libtiff-devel, libungif-devel
|
|
|
BuildRequires: librsvg2-devel, libotf-devel
|
|
|
@@ -124,7 +129,11 @@ export PATH="$PATH:/sbin:/usr/sbin"
|
|
|
%configure --with-pop --with-sound \
|
|
|
--libexecdir=%{_libdir} --infodir=%{infodir} \
|
|
|
--disable-rename \
|
|
|
+%if %{?_dist_release} >= "vl7"
|
|
|
--with-x-toolkit=gtk3 \
|
|
|
+%else
|
|
|
+ --with-x-toolkit=gtk \
|
|
|
+%endif
|
|
|
--with-freetype --with-xft \
|
|
|
--enable-font-backend \
|
|
|
--without-gpm \
|
|
|
@@ -373,6 +382,9 @@ unset PRIORITY
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Tue Feb 14 2012 Munehiro Yamamoto <munepi@vinelinux.org> 24.0.93-2
|
|
|
+- use gtk as X toolkit (for vl6)
|
|
|
+
|
|
|
* Mon Jan 30 2012 Munehiro Yamamoto <munepi@vinelinux.org> 24.0.93-1
|
|
|
- updated to 24.0.93 (24.1 pretest)
|
|
|
|
munepi