From d5a55e151b814c8b5848aef2fa8eeeea5865d974 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sat, 19 Aug 2017 15:38:38 +0200 Subject: [PATCH] Update to 0.37.2 --- .gitignore | 1 + sources | 2 +- vala.spec | 57 +++++++++++++++++++++++++++++++++++++++++---- valadoc-tests.patch | 24 +++++++++++++++++++ 4 files changed, 78 insertions(+), 6 deletions(-) create mode 100644 valadoc-tests.patch diff --git a/.gitignore b/.gitignore index b80144e..1987752 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,4 @@ /vala-0.36.2.tar.xz /vala-0.36.3.tar.xz /vala-0.36.4.tar.xz +/vala-0.37.2.tar.xz diff --git a/sources b/sources index 0d7579b..95cab67 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vala-0.36.4.tar.xz) = cc804b9ad0bda4968660084c5d5e38761b0d478a6c504d3d2e6188fdd2deef4a4315d7278191f19b3bcbee66e0b02733deb6050d168305c85cef8f203ecc13ac +SHA512 (vala-0.37.2.tar.xz) = 6167accc943b8ab3a77465bcaf2c51005eca1bfbd45899fb53aa4ef99184aa1393047140548e4f71c499f57b9b9d5673170150c098a58c553effcb24bee81222 diff --git a/vala.spec b/vala.spec index 467c483..aed2662 100644 --- a/vala.spec +++ b/vala.spec @@ -1,19 +1,24 @@ -%global api_ver 0.36 +%global api_ver 0.38 %global priority 90 Name: vala -Version: 0.36.4 -Release: 5%{?dist} +Version: 0.37.2 +Release: 1%{?dist} Summary: A modern programming language for GNOME # Most files are LGPLv2.1+, curses.vapi is 2-clause BSD License: LGPLv2+ and BSD URL: https://wiki.gnome.org/Projects/Vala -Source0: https://download.gnome.org/sources/vala/0.36/vala-%{version}.tar.xz +Source0: https://download.gnome.org/sources/vala/0.37/vala-%{version}.tar.xz + +# https://bugzilla.gnome.org/show_bug.cgi?id=786505 +Patch0: valadoc-tests.patch BuildRequires: flex BuildRequires: bison BuildRequires: glib2-devel +BuildRequires: gobject-introspection-devel +BuildRequires: graphviz-devel BuildRequires: libxslt # only if Vala source files are patched BuildRequires: vala @@ -84,8 +89,29 @@ applications and libraries written in C. This package contains documentation in a devhelp HTML book. +%package -n valadoc +Summary: Vala documentation generator +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description -n valadoc +Valadoc is a documentation generator for generating API documentation from Vala +source code. + + +%package -n valadoc-devel +Summary: Development files for valadoc +Requires: valadoc%{?_isa} = %{version}-%{release} + +%description -n valadoc-devel +Valadoc is a documentation generator for generating API documentation from Vala +source code. + +The valadoc-devel package contains libraries and header files for +developing applications that use valadoc. + + %prep -%setup -q +%autosetup -p1 %build @@ -112,6 +138,9 @@ done mkdir -p $RPM_BUILD_ROOT%{_datadir}/vala/vapi find %{buildroot} -name '*.la' -exec rm -f {} ';' +# Copy over previous libvala for temporary binary compat +cp -a %{_libdir}/libvala-0.36.so.* $RPM_BUILD_ROOT%{_libdir}/ + %check make check @@ -158,6 +187,7 @@ done %{_bindir}/vapigen-%{api_ver} %{_libdir}/pkgconfig/vapigen*.pc %{_libdir}/vala-%{api_ver}/ +%{_libdir}/libvala-0.36.so.* %{_libdir}/libvala-%{api_ver}.so.* %{_datadir}/aclocal/vala.m4 %{_datadir}/aclocal/vapigen.m4 @@ -178,8 +208,25 @@ done %files doc %doc %{_datadir}/devhelp/books/vala-%{api_ver} +%files -n valadoc +%{_bindir}/valadoc +%{_bindir}/valadoc-%{api_ver} +%{_libdir}/libvaladoc-%{api_ver}.so.0* +%{_libdir}/valadoc/ +%{_datadir}/valadoc/ +%{_mandir}/man1/valadoc-%{api_ver}.1* +%{_mandir}/man1/valadoc.1* + +%files -n valadoc-devel +%{_includedir}/valadoc-%{api_ver}/ +%{_libdir}/libvaladoc-%{api_ver}.so +%{_libdir}/pkgconfig/valadoc-%{api_ver}.pc + %changelog +* Thu Aug 10 2017 Kalev Lember - 0.37.2-1 +- Update to 0.37.2 + * Thu Aug 03 2017 Fedora Release Engineering - 0.36.4-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/valadoc-tests.patch b/valadoc-tests.patch new file mode 100644 index 0000000..069d61b --- /dev/null +++ b/valadoc-tests.patch @@ -0,0 +1,24 @@ +From b35e06350034af188705b9a89b686dc09264c245 Mon Sep 17 00:00:00 2001 +From: Rico Tzschichholz +Date: Sat, 19 Aug 2017 13:05:22 +0200 +Subject: [PATCH] valadoc/tests: Add the source vapi directory to driver-test + +https://bugzilla.gnome.org/show_bug.cgi?id=786505 +--- + valadoc/tests/drivers/generic-api-test.vala | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/valadoc/tests/drivers/generic-api-test.vala b/valadoc/tests/drivers/generic-api-test.vala +index bf71bfe31..759120543 100644 +--- a/valadoc/tests/drivers/generic-api-test.vala ++++ b/valadoc/tests/drivers/generic-api-test.vala +@@ -2720,6 +2720,7 @@ public static void test_driver () { + settings.with_deps = false; + settings.verbose = false; + settings.wiki_directory = null; ++ settings.vapi_directories = { Path.build_filename (TOP_SRC_DIR, "vapi") }; + settings.pkg_name = "out"; + settings.path = "out"; + +-- +2.14.1 \ No newline at end of file