Update to 0.36.4

[packages/vala.git] / vala.spec

diff --git a/vala.spec b/vala.spec
index 1c96de79bce0a7c8e0c79ab3842d032d5e61d434..6f497f52a7a421e539aad26e6fba50b7e4f32fee 100644 (file)
--- a/vala.spec
+++ b/vala.spec
@@ -1,27 +1,30 @@
-%define        major_ver       0.24
+# Conditional build:
+%bcond_with    bootstrap       # bootstrap build
+
+%define        major_ver       0.36
 Summary:       GObject-based language compiler
 Summary(pl.UTF-8):     Kompilator języka opartego na bibliotece GObject
 Name:          vala
-Version:       0.24.0
-Release:       2
+Version:       0.36.4
+Release:       1
 Epoch:         2
 License:       LGPL v2+
 Group:         Development/Languages
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/vala/0.24/%{name}-%{version}.tar.xz
-# Source0-md5: beddeff9c06d3c278988b237da0e7401
-Patch0:                %{name}-atk-update.patch
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/vala/0.36/%{name}-%{version}.tar.xz
+# Source0-md5: 3c19014093f1a3d995357253b463082c
 URL:           http://live.gnome.org/Vala
-BuildRequires: autoconf >= 2.50
+BuildRequires: autoconf >= 2.65
 BuildRequires: automake >= 1:1.11
 BuildRequires: bison
 BuildRequires: flex
-BuildRequires: glib2-devel >= 1:2.18.0
-BuildRequires: libtool
+BuildRequires: glib2-devel >= 1:2.32.0
+BuildRequires: libtool >= 2:2.2.6
 BuildRequires: libxslt-progs
-BuildRequires: pkgconfig
+BuildRequires: pkgconfig >= 1:0.21
 BuildRequires: tar >= 1:1.22
+%{!?with_bootstrap:BuildRequires:      vala >= 2:0.25.1}
 BuildRequires: xz
-Requires:      glib2 >= 1:2.18.0
+Requires:      glib2 >= 1:2.32.0
 Conflicts:     gdk-pixbuf2 < 2.23.3-1
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -61,6 +64,9 @@ Summary:      vala API documentation
 Summary(pl.UTF-8):     Dokumentacja API vala
 Group:         Documentation
 Requires:      devhelp
+%if "%{_rpmversion}" >= "5"
+BuildArch:     noarch
+%endif
 
 %description apidocs
 vala API documentation.
@@ -70,7 +76,6 @@ Dokumentacja API vala.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %{__libtoolize}
@@ -79,8 +84,7 @@ Dokumentacja API vala.
 %{__autoheader}
 %{__automake}
 %configure \
-       --disable-silent-rules \
-       --enable-vapigen
+       --disable-silent-rules
 %{__make}
 
 %install
@@ -100,7 +104,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog MAINTAINERS NEWS README THANKS
+%doc AUTHORS ChangeLog NEWS README THANKS
 %attr(755,root,root) %{_bindir}/vala
 %attr(755,root,root) %{_bindir}/vala-%{major_ver}
 %attr(755,root,root) %{_bindir}/vala-gen-introspect
@@ -116,8 +120,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libvala-%{major_ver}.so
 %{_includedir}/vala-%{major_ver}
 %{_pkgconfigdir}/libvala-%{major_ver}.pc
-%{_npkgconfigdir}/vapigen-%{major_ver}.pc
-%{_npkgconfigdir}/vapigen.pc
+%{_pkgconfigdir}/vapigen-%{major_ver}.pc
+%{_pkgconfigdir}/vapigen.pc
 %dir %{_datadir}/vala
 %{_datadir}/vala/Makefile.vapigen
 %dir %{_datadir}/vala/vapi