From 680e0a29c234c1ab720cbce0c669e3b4bb6a516f Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Sat, 19 Jan 2008 20:36:16 +0000 Subject: [PATCH] Update vala to 0.1.6 --- .cvsignore | 2 +- sources | 2 +- vala.spec | 25 +++++++++++++------------ 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/.cvsignore b/.cvsignore index 41b372d..810f915 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -vala-0.1.5.tar.bz2 +vala-0.1.6.tar.bz2 diff --git a/sources b/sources index bb51286..8c4ecc1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4e082ecb7f60ebdc49f3bd19ae7ebca2 vala-0.1.5.tar.bz2 +e4dd3df55cd9d568d126a3452ebd152b vala-0.1.6.tar.bz2 diff --git a/vala.spec b/vala.spec index 9a7d44f..90b6b83 100644 --- a/vala.spec +++ b/vala.spec @@ -1,6 +1,6 @@ Name: vala -Version: 0.1.5 -Release: 5%{?dist} +Version: 0.1.6 +Release: 1%{?dist} Summary: A modern programming language for GNOME Group: Development/Languages @@ -8,7 +8,6 @@ Group: Development/Languages License: LGPLv2+ and BSD URL: http://live.gnome.org/Vala Source0: http://download.gnome.org/sources/vala/0.1/vala-%{version}.tar.bz2 -Patch0: vala-0.1.5-gen-project.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel flex bison devhelp @@ -64,14 +63,17 @@ applications and libraries written in C. This package contains tools to generate Vala projects, as well as API bindings from existing C libraries, allowing access from Vala programs. -%package docs +%package doc Summary: Documentation for %{name} Group: Documentation License: LGPLv2+ Requires: %{name} = %{version}-%{release} Requires: devhelp +Provides: %{name}-docs = %{version}-%{release} +Obsoletes: %{name}-docs < %{version}-%{release} -%description docs + +%description doc Vala is a new programming language that aims to bring modern programming language features to GNOME developers without imposing any additional runtime requirements and without using a different ABI compared to @@ -82,10 +84,6 @@ This package contains documentation in a devhelp HTML book. %prep %setup -q -%patch0 -p1 -b .gen-project -# touch the file, otherwise the build process will try to regenerate -# the .{c,h} files using an installed vala compiler -touch gen-project/vala-gen-project.vala.stamp %build @@ -100,8 +98,6 @@ make %{?_smp_mflags} rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT rm $RPM_BUILD_ROOT%{_libdir}/libvala.la -# copy Gee vapi file -cp -p vapi/gee-1.0.vapi $RPM_BUILD_ROOT%{_datadir}/vala/vapi/ %clean @@ -132,13 +128,18 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/vala %{_mandir}/*/*gen* -%files docs +%files doc %defattr(-,root,root,-) %{_datadir}/devhelp/books/vala %changelog +* Sat Jan 19 2008 Michel Salim - 0.1.6-1 +- Update to 0.1.6 +- Revert vapi addition, needed declarations have been inlined (r846) +- Rename -docs subpackage to -doc, to comply with guidelines + * Tue Jan 15 2008 Michel Salim - 0.1.5-5 - Manually add Gee vapi file to package (bz #428692)