Skip to content

Commit

Permalink
[packaging] use bootstrap module
Browse files Browse the repository at this point in the history
  • Loading branch information
Islam Amer committed May 24, 2013
1 parent 6c51c78 commit 4cbef57
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 121 deletions.
21 changes: 0 additions & 21 deletions rpm/disable-bootstrap.patch

This file was deleted.

31 changes: 11 additions & 20 deletions rpm/vala.spec
Expand Up @@ -15,8 +15,6 @@ Group: Development/Languages
License: LGPLv2+ and BSD
URL: http://live.gnome.org/Vala
Source0: http://download.gnome.org/sources/vala/0.16/vala-%{version}.tar.xz
Source100: vala.yaml
Patch0: disable-bootstrap.patch
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
BuildRequires: pkgconfig(glib-2.0)
Expand Down Expand Up @@ -92,33 +90,26 @@ using the %{name} compiler.
%prep
%setup -q -n %{name}-%{version}/%{name}

# disable-bootstrap.patch
%patch0 -p1
# >> setup
# << setup

%build
# >> build pre
%autogen
# << build pre

%configure --disable-static \
--enable-vapigen
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 %{?jobs:-j%jobs}
make V=1 %{?jobs:-j%jobs}
make install

# >> build post
# << build post
cd ../vala
export VALAC=$PREFIX/bin/valac
%autogen --disable-static --enable-vapigen

make %{?jobs:-j%jobs}

%install
rm -rf %{buildroot}
# >> install pre
# << install pre
%make_install

# >> install post
# << install post

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig
Expand Down
80 changes: 0 additions & 80 deletions rpm/vala.yaml

This file was deleted.

0 comments on commit 4cbef57

Please sign in to comment.