Hello community,
here is the log from the commit of package xfce4-vala for openSUSE:Factory
checked in at Mon May 16 11:28:06 CEST 2011.
--------
--- xfce4-vala/xfce4-vala.changes 2011-02-17 11:00:19.000000000 +0100
+++ /mounts/work_src_done/STABLE/xfce4-vala/xfce4-vala.changes 2011-05-13
13:08:50.000000000 +0200
@@ -1,0 +2,8 @@
+Fri May 13 10:42:44 UTC 2011 - g...@opensuse.org
+
+- update to version 4.8.1
+ - update to vala 0.12
+- added xfce4-vala-multiple-vala-versions.patch to retain
+ compatibility with vala 0.10
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
xfce4-vala-4.8.0.tar.bz2
New:
----
xfce4-vala-4.8.1.tar.bz2
xfce4-vala-multiple-vala-versions.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xfce4-vala.spec ++++++
--- /var/tmp/diff_new_pack.9HVzXh/_old 2011-05-16 11:25:19.000000000 +0200
+++ /var/tmp/diff_new_pack.9HVzXh/_new 2011-05-16 11:25:19.000000000 +0200
@@ -16,9 +16,14 @@
#
+%if %suse_version <= 1140
+%define vala_version 0.10
+%else
+%define vala_version 0.12
+%endif
Name: xfce4-vala
-Version: 4.8.0
+Version: 4.8.1
Release: 1
License: LGPLv2.1+
Summary: Vala bindings to Xfce
@@ -26,13 +31,20 @@
Group: Development/Libraries/Other
Source: %{name}-%{version}.tar.bz2
Source100: %{name}-rpmlintrc
+# PATCH-FEATURE-OPENSUSE xfce4-vala-multiple-vala-versions.patch
g...@opensuse.org -- Support multiple vala versions
+Patch0: xfce4-vala-multiple-vala-versions.patch
BuildRequires: fdupes
BuildRequires: pkgconfig(libxfce4util-1.0)
BuildRequires: pkgconfig(libxfconf-0)
BuildRequires: pkgconfig(libxfce4ui-1)
BuildRequires: pkgconfig(libxfce4panel-1.0)
BuildRequires: pkgconfig(exo-1)
+%if %suse_version <= 1140
BuildRequires: pkgconfig(vala-0.10)
+%else
+BuildRequires: pkgconfig(libvala-0.12)
+%endif
+BuildRequires: xfce4-dev-tools
BuildRequires: vala >= 0.10
Requires: vala >= 0.10
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -42,14 +54,16 @@
%prep
%setup -q
+%patch0 -p1
%build
+xdt-autogen
%configure
make %{?_smp_mflags}
%install
%make_install
-%fdupes %{buildroot}/usr/share/vala-0.10
+%fdupes %{buildroot}/usr/share/vala-%{vala_version}
%clean
rm -rf %{buildroot}
@@ -58,9 +72,9 @@
%defattr(-,root,root)
%doc AUTHORS COPYING ChangeLog NEWS README TODO
%{_libdir}/pkgconfig/xfce4-vala.pc
-%dir %{_datadir}/vala-0.10
-%dir %{_datadir}/vala-0.10/vapi
-%{_datadir}/vala-0.10/vapi/*.deps
-%{_datadir}/vala-0.10/vapi/*.vapi
+%dir %{_datadir}/vala-%{vala_version}
+%dir %{_datadir}/vala-%{vala_version}/vapi
+%{_datadir}/vala-%{vala_version}/vapi/*.deps
+%{_datadir}/vala-%{vala_version}/vapi/*.vapi
%changelog
++++++ xfce4-vala-4.8.0.tar.bz2 -> xfce4-vala-4.8.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xfce4-vala-4.8.0/ChangeLog
new/xfce4-vala-4.8.1/ChangeLog
--- old/xfce4-vala-4.8.0/ChangeLog 2011-02-13 21:49:02.000000000 +0100
+++ new/xfce4-vala-4.8.1/ChangeLog 2011-04-27 21:09:02.000000000 +0200
@@ -1,3 +1,13 @@
+2011-04-27 Mike Massonnet
+
+=== Release 4.8.1 ===
+
+
+2011-04-27 Mike Massonnet
+
+Update build to Vala 0.12
+
+
2011-02-13 Mike Massonnet
=== Release 4.8.0 ===
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xfce4-vala-4.8.0/NEWS new/xfce4-vala-4.8.1/NEWS
--- old/xfce4-vala-4.8.0/NEWS 2011-02-13 21:41:12.000000000 +0100
+++ new/xfce4-vala-4.8.1/NEWS 2011-04-27 20:58:50.000000000 +0200
@@ -1,4 +1,8 @@
++ Version 4.8.1, 2011-04-27
+
+Updated package to Vala 0.12.
+
+ Version 4.8.0, 2011-02-13
Added libxfce4ui.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xfce4-vala-4.8.0/acinclude.m4
new/xfce4-vala-4.8.1/acinclude.m4
--- old/xfce4-vala-4.8.0/acinclude.m4 2010-10-31 08:59:11.000000000 +0100
+++ new/xfce4-vala-4.8.1/acinclude.m4 2011-04-27 20:57:34.000000000 +0200
@@ -18,31 +18,31 @@
dnl # M8T_CHECK_VALA(minimum_version)
dnl #
-dnl # Check for the package vala-0.10 and substitutes useful Vala variables.
+dnl # Check for the package libvala-0.12 and substitutes useful Vala variables.
dnl #
AC_DEFUN([M8T_CHECK_VALA],
[
-PKG_CHECK_MODULES([VALA], [vala-0.10 >= $1])
+PKG_CHECK_MODULES([VALA], [libvala-0.12 >= $1])
M8T_VALA_PROGS()
M8T_VAPI_DIR()
])
dnl # M8T_VALA_PROGS()
dnl #
-dnl # Substitutes VALAC, VAPIGEN and VALAGI from vala-0.10 pkgconfig file.
+dnl # Substitutes VALAC, VAPIGEN and VALAGI from libvala-0.12 pkgconfig file.
dnl #
AC_DEFUN([M8T_VALA_PROGS],
[
AC_PATH_PROG([VALAC], [valac], [valac])
-AC_SUBST([VAPIGEN], `$PKG_CONFIG --variable=vapigen vala-0.10`)
-AC_SUBST([VALAGI], `$PKG_CONFIG --variable=vala_gen_introspect vala-0.10`)
+AC_SUBST([VAPIGEN], `$PKG_CONFIG --variable=vapigen libvala-0.12`)
+AC_SUBST([VALAGI], `$PKG_CONFIG --variable=vala_gen_introspect libvala-0.12`)
])
dnl # M8T_VAPI_DIR()
dnl #
-dnl # Substitutes vapidir from vala-0.10 pkgconfig file.
+dnl # Substitutes vapidir from libvala-0.12 pkgconfig file.
dnl #
AC_DEFUN([M8T_VAPI_DIR],
[
-AC_SUBST([vapidir], `$PKG_CONFIG --variable=vapidir vala-0.10`)
+AC_SUBST([vapidir], `$PKG_CONFIG --variable=vapidir libvala-0.12`)
])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xfce4-vala-4.8.0/configure
new/xfce4-vala-4.8.1/configure
--- old/xfce4-vala-4.8.0/configure 2011-02-13 21:49:20.000000000 +0100
+++ new/xfce4-vala-4.8.1/configure 2011-04-27 21:09:38.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for Xfce4 Vala 4.8.0.
+# Generated by GNU Autoconf 2.68 for Xfce4 Vala 4.8.1.
#
# Report bugs to <mmasson...@xfce.org>.
#
@@ -559,8 +559,8 @@
# Identity of this package.
PACKAGE_NAME='Xfce4 Vala'
PACKAGE_TARNAME='xfce4-vala'
-PACKAGE_VERSION='4.8.0'
-PACKAGE_STRING='Xfce4 Vala 4.8.0'
+PACKAGE_VERSION='4.8.1'
+PACKAGE_STRING='Xfce4 Vala 4.8.1'
PACKAGE_BUGREPORT='mmasson...@xfce.org'
PACKAGE_URL=''
@@ -1200,7 +1200,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures Xfce4 Vala 4.8.0 to adapt to many kinds of systems.
+\`configure' configures Xfce4 Vala 4.8.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1266,7 +1266,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Xfce4 Vala 4.8.0:";;
+ short | recursive ) echo "Configuration of Xfce4 Vala 4.8.1:";;
esac
cat <<\_ACEOF
@@ -1357,7 +1357,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Xfce4 Vala configure 4.8.0
+Xfce4 Vala configure 4.8.1
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1374,7 +1374,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Xfce4 Vala $as_me 4.8.0, which was
+It was created by Xfce4 Vala $as_me 4.8.1, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2189,7 +2189,7 @@
# Define the identity of the package.
PACKAGE='xfce4-vala'
- VERSION='4.8.0'
+ VERSION='4.8.1'
cat >>confdefs.h <<_ACEOF
@@ -2490,12 +2490,12 @@
pkg_cv_VALA_CFLAGS="$VALA_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"vala-0.10 >= 0.10.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "vala-0.10 >= 0.10.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"libvala-0.12 >= 0.12.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libvala-0.12 >= 0.12.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_VALA_CFLAGS=`$PKG_CONFIG --cflags "vala-0.10 >= 0.10.0" 2>/dev/null`
+ pkg_cv_VALA_CFLAGS=`$PKG_CONFIG --cflags "libvala-0.12 >= 0.12.0"
2>/dev/null`
else
pkg_failed=yes
fi
@@ -2506,12 +2506,12 @@
pkg_cv_VALA_LIBS="$VALA_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"vala-0.10 >= 0.10.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "vala-0.10 >= 0.10.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"libvala-0.12 >= 0.12.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libvala-0.12 >= 0.12.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_VALA_LIBS=`$PKG_CONFIG --libs "vala-0.10 >= 0.10.0" 2>/dev/null`
+ pkg_cv_VALA_LIBS=`$PKG_CONFIG --libs "libvala-0.12 >= 0.12.0" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -2531,14 +2531,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- VALA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
"vala-0.10 >= 0.10.0" 2>&1`
+ VALA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
"libvala-0.12 >= 0.12.0" 2>&1`
else
- VALA_PKG_ERRORS=`$PKG_CONFIG --print-errors "vala-0.10 >=
0.10.0" 2>&1`
+ VALA_PKG_ERRORS=`$PKG_CONFIG --print-errors "libvala-0.12 >=
0.12.0" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$VALA_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (vala-0.10 >= 0.10.0) were not met:
+ as_fn_error $? "Package requirements (libvala-0.12 >= 0.12.0) were not
met:
$VALA_PKG_ERRORS
@@ -2612,13 +2612,13 @@
fi
-VAPIGEN=`$PKG_CONFIG --variable=vapigen vala-0.10`
+VAPIGEN=`$PKG_CONFIG --variable=vapigen libvala-0.12`
-VALAGI=`$PKG_CONFIG --variable=vala_gen_introspect vala-0.10`
+VALAGI=`$PKG_CONFIG --variable=vala_gen_introspect libvala-0.12`
-vapidir=`$PKG_CONFIG --variable=vapidir vala-0.10`
+vapidir=`$PKG_CONFIG --variable=vapidir libvala-0.12`
@@ -2631,7 +2631,7 @@
fi
if test x"$with_default_vapidir" == xno ; then
- vapidir=${datarootdir}/vala-0.10/vapi
+ vapidir=${datarootdir}/vala-0.12/vapi
fi
@@ -3196,7 +3196,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by Xfce4 Vala $as_me 4.8.0, which was
+This file was extended by Xfce4 Vala $as_me 4.8.1, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3249,7 +3249,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-Xfce4 Vala config.status 4.8.0
+Xfce4 Vala config.status 4.8.1
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xfce4-vala-4.8.0/configure.ac
new/xfce4-vala-4.8.1/configure.ac
--- old/xfce4-vala-4.8.0/configure.ac 2011-02-13 21:49:13.000000000 +0100
+++ new/xfce4-vala-4.8.1/configure.ac 2011-04-27 21:09:30.000000000 +0200
@@ -12,8 +12,8 @@
dnl Version information
m4_define([project_version_major], [4])
m4_define([project_version_minor], [8])
-m4_define([project_version_micro], [0])
-m4_define([project_version_build], [8aab7e7])
+m4_define([project_version_micro], [1])
+m4_define([project_version_build], [c969313])
m4_define([project_version_tag], []) # leave empty for release
m4_define([project_version],
[project_version_major().project_version_minor().project_version_micro()project_version_tag()])
@@ -33,14 +33,14 @@
M8T_CHECK_PACKAGE([EXO], [exo-1], [0.6.0])
dnl Check for Vala
-M8T_CHECK_VALA([0.10.0])
+M8T_CHECK_VALA([0.12.0])
AC_ARG_WITH([default-vapidir],
AC_HELP_STRING([--with-default-vapidir],
[Use default VAPI prefix from Vala
installation]),
[],
[with_default_vapidir=no])
if test x"$with_default_vapidir" == xno ; then
- AC_SUBST([vapidir], [${datarootdir}/vala-0.10/vapi])
+ AC_SUBST([vapidir], [${datarootdir}/vala-0.12/vapi])
fi
dnl Makefile outputs
Files
old/xfce4-vala-4.8.0/packages/libxfce4util-1.0/.libxfce4util-1.0-custom.vala.swp
and
new/xfce4-vala-4.8.1/packages/libxfce4util-1.0/.libxfce4util-1.0-custom.vala.swp
differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xfce4-vala-4.8.0/vapi/exo-1.vapi
new/xfce4-vala-4.8.1/vapi/exo-1.vapi
--- old/xfce4-vala-4.8.0/vapi/exo-1.vapi 2011-02-13 20:17:42.000000000
+0100
+++ new/xfce4-vala-4.8.1/vapi/exo-1.vapi 2011-04-27 20:59:53.000000000
+0200
@@ -1,4 +1,4 @@
-/* exo-1.vapi generated by vapigen-0.10, do not modify. */
+/* exo-1.vapi generated by vapigen-0.12, do not modify. */
[CCode (cprefix = "Exo", lower_case_cprefix = "exo_")]
namespace Exo {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xfce4-vala-4.8.0/vapi/libxfce4panel-1.0.vapi
new/xfce4-vala-4.8.1/vapi/libxfce4panel-1.0.vapi
--- old/xfce4-vala-4.8.0/vapi/libxfce4panel-1.0.vapi 2011-02-13
20:17:40.000000000 +0100
+++ new/xfce4-vala-4.8.1/vapi/libxfce4panel-1.0.vapi 2011-04-27
20:59:51.000000000 +0200
@@ -1,4 +1,4 @@
-/* libxfce4panel-1.0.vapi generated by vapigen-0.10, do not modify. */
+/* libxfce4panel-1.0.vapi generated by vapigen-0.12, do not modify. */
[CCode (cprefix = "Xfce", lower_case_cprefix = "xfce_")]
namespace Xfce {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xfce4-vala-4.8.0/vapi/libxfce4ui-1.vapi
new/xfce4-vala-4.8.1/vapi/libxfce4ui-1.vapi
--- old/xfce4-vala-4.8.0/vapi/libxfce4ui-1.vapi 2011-02-13 20:17:38.000000000
+0100
+++ new/xfce4-vala-4.8.1/vapi/libxfce4ui-1.vapi 2011-04-27 20:59:50.000000000
+0200
@@ -1,4 +1,4 @@
-/* libxfce4ui-1.vapi generated by vapigen-0.10, do not modify. */
+/* libxfce4ui-1.vapi generated by vapigen-0.12, do not modify. */
[CCode (cprefix = "Xfce", lower_case_cprefix = "xfce_")]
namespace Xfce {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xfce4-vala-4.8.0/vapi/libxfce4util-1.0.vapi
new/xfce4-vala-4.8.1/vapi/libxfce4util-1.0.vapi
--- old/xfce4-vala-4.8.0/vapi/libxfce4util-1.0.vapi 2011-02-13
20:17:35.000000000 +0100
+++ new/xfce4-vala-4.8.1/vapi/libxfce4util-1.0.vapi 2011-04-27
20:59:47.000000000 +0200
@@ -1,4 +1,4 @@
-/* libxfce4util-1.0.vapi generated by vapigen-0.10, do not modify. */
+/* libxfce4util-1.0.vapi generated by vapigen-0.12, do not modify. */
[CCode (cprefix = "Xfce", lower_case_cprefix = "xfce_")]
namespace Xfce {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xfce4-vala-4.8.0/vapi/libxfconf-0.vapi
new/xfce4-vala-4.8.1/vapi/libxfconf-0.vapi
--- old/xfce4-vala-4.8.0/vapi/libxfconf-0.vapi 2011-02-13 20:17:36.000000000
+0100
+++ new/xfce4-vala-4.8.1/vapi/libxfconf-0.vapi 2011-04-27 20:59:48.000000000
+0200
@@ -1,4 +1,4 @@
-/* libxfconf-0.vapi generated by vapigen-0.10, do not modify. */
+/* libxfconf-0.vapi generated by vapigen-0.12, do not modify. */
[CCode (cprefix = "Xfconf", lower_case_cprefix = "xfconf_")]
namespace Xfconf {
++++++ xfce4-vala-multiple-vala-versions.patch ++++++
diff -ur xfce4-vala-4.8.1.orig/configure.ac xfce4-vala-4.8.1/configure.ac
--- xfce4-vala-4.8.1.orig/configure.ac 2011-05-13 11:31:25.120000008 +0200
+++ xfce4-vala-4.8.1/configure.ac 2011-05-13 12:56:30.903999793 +0200
@@ -33,14 +33,29 @@
M8T_CHECK_PACKAGE([EXO], [exo-1], [0.6.0])
dnl Check for Vala
-M8T_CHECK_VALA([0.12.0])
+PKG_CHECK_MODULES([VALA], [libvala-0.12], [AC_SUBST([VALA_VERSION], [0.12])], [
+ PKG_CHECK_MODULES([VALA], [vala-0.10],
+ [AC_SUBST([VALA_VERSION], [0.10])])
+])
+if test "${VALA_VERSION}" = "0.10" ; then
+ AC_SUBST([VALA_NAME], [vala])
+else
+ AC_SUBST([VALA_NAME], [libvala])
+fi
+AC_PATH_PROG([VALAC], [valac], [valac])
+AC_SUBST([VAPIGEN],
+ `$PKG_CONFIG --variable=vapigen ${VALA_NAME}-${VALA_VERSION}`)
+AC_SUBST([VALAGI],
+ `$PKG_CONFIG --variable=vala_gen_introspect ${VALA_NAME}-${VALA_VERSION}`)
+AC_SUBST([vapidir],
+ `$PKG_CONFIG --variable=vapidir ${VALA_NAME}-${VALA_VERSION}`)
AC_ARG_WITH([default-vapidir],
AC_HELP_STRING([--with-default-vapidir],
[Use default VAPI prefix from Vala
installation]),
[],
[with_default_vapidir=no])
if test x"$with_default_vapidir" == xno ; then
- AC_SUBST([vapidir], [${datarootdir}/vala-0.12/vapi])
+ AC_SUBST([vapidir], [${datarootdir}/vala-${VALA_VERSION}/vapi])
fi
dnl Makefile outputs
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
