Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Update to version 0.46.5.
[update] Update vala to version 0.46.5. Contributes to JB#48719

Signed-off-by: Marko Saukko <marko.saukko@jolla.com>
  • Loading branch information
saukko committed Jan 28, 2020
1 parent 4a218a1 commit d924129
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 26 deletions.
4 changes: 2 additions & 2 deletions .gitmodules
@@ -1,6 +1,6 @@
[submodule "vala"]
path = vala
url = https://git.merproject.org/mirror/vala.git
url = https://git.sailfishos.org/mirror/vala.git
[submodule "vala-bootstrap"]
path = vala-bootstrap
url = https://git.merproject.org/mirror/vala-bootstrap.git
url = https://git.sailfishos.org/mirror/vala-bootstrap.git
29 changes: 7 additions & 22 deletions rpm/vala.spec
@@ -1,9 +1,8 @@
Name: vala

Summary: A modern programming language for GNOME
Version: 0.34.11
Version: 0.46.5
Release: 1
Group: Development/Languages
License: LGPLv2+ and BSD
URL: http://live.gnome.org/Vala
Source0: http://download.gnome.org/sources/vala/0.34.11/vala-%{version}.tar.xz
Expand All @@ -12,6 +11,7 @@ Requires(postun): /sbin/ldconfig
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: flex
BuildRequires: bison
BuildRequires: autoconf-archive

%description
Vala is a new programming language that aims to bring modern programming
Expand All @@ -32,7 +32,6 @@ type system.
%package doc
Summary: Documentation for %{name}
License: LGPLv2+
Group: Documentation
Requires: %{name} = %{version}-%{release}
Requires: devhelp

Expand All @@ -48,7 +47,6 @@ This package contains documentation in a devhelp HTML book.
%package tools
Summary: Tools for creating projects and bindings for %{name}
License: LGPLv2+
Group: Development/Languages
Requires: %{name} = %{version}-%{release}
Requires: gnome-common
Requires: intltool
Expand All @@ -66,7 +64,6 @@ from existing C libraries, allowing access from Vala programs.

%package devel
Summary: Development files for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}

%description devel
Expand All @@ -80,23 +77,12 @@ using the %{name} compiler.


%prep
%setup -q -n %{name}-%{version}/%{name}
%autosetup -n %{name}-%{version}/%{name}

%build

cd ../vala-bootstrap
export PREFIX=$PWD/../bootstrap
./autogen.sh --prefix=$PREFIX --enable-build-from-vala=no --disable-vapigen
./configure --prefix=$PREFIX --enable-build-from-vala=no --disable-vapigen

make V=1 %{?jobs:-j%jobs}
make install

cd ../vala
export VALAC=$PREFIX/bin/valac
echo -n %{version} > .version
echo -n %{version} > .tarball-version
%autogen --disable-static --enable-vapigen
echo %{version} | cut -d '+' -f 1 > .tarball-version
cp .tarball-version .version
%autogen --disable-static --disable-valadoc
make %{?jobs:-j%jobs}

%install
Expand All @@ -111,7 +97,7 @@ rm -rf %{buildroot}/%{_datadir}/devhelp/books/vala-*

%files
%defattr(-,root,root,-)
%doc COPYING
%license COPYING
%{_bindir}/valac
%{_bindir}/valac-*
%{_bindir}/vala
Expand All @@ -128,7 +114,6 @@ rm -rf %{buildroot}/%{_datadir}/devhelp/books/vala-*
%files tools
%defattr(-,root,root,-)
%{_bindir}/*gen*
%{_bindir}/vapicheck*
%{_libdir}/vala*

%files devel
Expand Down
2 changes: 1 addition & 1 deletion vala
Submodule vala updated from c27606 to 8213d9
1 change: 0 additions & 1 deletion vala-bootstrap
Submodule vala-bootstrap deleted from b2beea

0 comments on commit d924129

Please sign in to comment.