Merge branch 'master' of ssh://pkgs.fedoraproject.org/vala

Conflicts:
	.gitignore
	sources
	vala.spec
This commit is contained in:
Michel Alexandre Salim 2010-09-12 15:46:30 +02:00 committed by Michel Alexandre Salim
commit 0acbc1a230

View File

@ -18,7 +18,6 @@ Source0: http://download.gnome.org/sources/vala/0.9/vala-%{version}.tar.b
Source1: vala-mode.el
Source2: vala-init.el
Source3: emacs-vala-COPYING
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtk2-devel flex bison devhelp gecko-libs >= 1.9
BuildRequires: emacs emacs-el
@ -160,10 +159,6 @@ mkdir -p $RPM_BUILD_ROOT%{_emacs_sitestartdir}
cp -p emacs-vala/*.el* $RPM_BUILD_ROOT%{_emacs_sitelispdir}/%{name}
cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_emacs_sitestartdir}
%clean
rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
@ -224,6 +219,10 @@ rm -rf $RPM_BUILD_ROOT
- Make -doc subpackage noarch
- Mark -doc files as %%doc
* Wed Aug 25 2010 Brian Pepple <bpepple@fedoraproject.org> - 0.9.7-1
- Update to 0.9.7.
- Remove clean section & buildroot. No longer needed.
* Mon Aug 9 2010 Michel Salim <salimma@fedoraproject.org> - 0.9.5-1
- Update to 0.9.5