diff --git a/.cvsignore b/.cvsignore index af57d33..c48aa89 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -vala-0.8.1.tar.bz2 +vala-0.9.1.tar.bz2 diff --git a/sources b/sources index 15aaef7..bf5b4c0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3e105d7f39e55925299a3e6e82c32de7 vala-0.8.1.tar.bz2 +cf11b4c544bfb44dc4aea478d4e56464 vala-0.9.1.tar.bz2 diff --git a/vala.spec b/vala.spec index 1abe783..ad41bcf 100644 --- a/vala.spec +++ b/vala.spec @@ -1,20 +1,7 @@ -%if %($(pkg-config emacs) ; echo $?) -%if 0%{?rhel} -%define emacs_version 21.4 -%else -# This will get overridden by pkg-config; defaulting to the version in F9 -%define emacs_version 22.2 -%endif -%define emacs_lispdir %{_datadir}/emacs/site-lisp -%define emacs_startdir %{_datadir}/emacs/site-lisp/site-start.d -%else -%define emacs_version %(pkg-config emacs --modversion) -%define emacs_lispdir %(pkg-config emacs --variable sitepkglispdir) -%define emacs_startdir %(pkg-config emacs --variable sitestartdir) -%endif +%global main_ver 0.9 Name: vala -Version: 0.8.1 +Version: %{main_ver}.1 Release: 1%{?dist} Summary: A modern programming language for GNOME @@ -22,13 +9,13 @@ Group: Development/Languages # Most files are LGPLv2.1+, curses.vapi is 2-clause BSD License: LGPLv2+ and BSD URL: http://live.gnome.org/Vala -Source0: http://download.gnome.org/sources/vala/0.8/vala-%{version}.tar.bz2 -Source1: vala-mode.el -Source2: vala-init.el +Source0: http://download.gnome.org/sources/vala/%{main_ver}/vala-%{version}.tar.bz2 +Source1: vala-mode.el +Source2: vala-init.el BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel flex bison devhelp gecko-libs >= 1.9 -BuildRequires: emacs emacs-el +BuildRequires: emacs emacs-el Requires: gtk2-devel %description @@ -101,16 +88,33 @@ applications and libraries written in C. This package contains documentation in a devhelp HTML book. -%package -n emacs-vala +%package -n emacs-%{name} Summary: Vala mode for Emacs Group: Applications/Editors License: GPLv2+ -Requires: emacs(bin) >= %{emacs_version} + +BuildArch: noarch +# Provide upgrade path from older, arch-specific package +Obsoletes: emacs-%{name} < %{version}-%{release} +Requires: emacs(bin) >= %{_emacs_version} -%description -n emacs-vala +%description -n emacs-%{name} An Emacs mode for editing Vala source code. +%package -n emacs-%{name}-el +Summary: Elisp source files for emacs-%{name} +Group: Applications/Editors +License: GPLv2+ + +BuildArch: noarch +Requires: emacs-%{name} = %{version}-%{release} + +%description -n emacs-%{name}-el +This package contains the elisp source files for Vala under GNU +Emacs. You do not need to install this package to run Vala. Install +the emacs-%{name} package to use Vala with GNU Emacs. + %prep %setup -q @@ -124,7 +128,7 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool make %{?_smp_mflags} # Compile emacs module mkdir emacs-vala && cd emacs-vala && cp -p %{SOURCE1} . -emacs -batch -f batch-byte-compile vala-mode.el +%{_emacs_bytecompile} vala-mode.el # checks currently utilize installed Vala, not the one being compiled @@ -138,10 +142,10 @@ make install DESTDIR=$RPM_BUILD_ROOT rm $RPM_BUILD_ROOT%{_libdir}/libvala.la # Emacs mode files -mkdir -p $RPM_BUILD_ROOT%{emacs_lispdir} -mkdir -p $RPM_BUILD_ROOT%{emacs_startdir} -cp -p emacs-vala/*.el* $RPM_BUILD_ROOT%{emacs_lispdir} -cp -p %{SOURCE2} $RPM_BUILD_ROOT%{emacs_startdir} +mkdir -p $RPM_BUILD_ROOT%{_emacs_sitelispdir}/%{name} +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 @@ -176,14 +180,24 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %{_datadir}/devhelp/books/vala -%files -n emacs-vala +%files -n emacs-%{name} %defattr(-,root,root,-) -%{emacs_lispdir}/*.el* -%{emacs_startdir}/* +%dir %{_emacs_sitelispdir}/%{name} +%{_emacs_sitelispdir}/%{name}/*.elc +%{_emacs_sitestartdir}/*.el + +%files -n emacs-%{name}-el +%defattr(-,root,root,-) +%{_emacs_sitelispdir}/%{name}/*.el %changelog +* Sun Jun 13 2010 Michel Salim - 0.9.1-1 +- Update to 0.9.1 +- Make emacs-vala subpackage noarch; split off source file to -el subpackage + according to Emacs packaging guidelines + * Tue Apr 27 2010 Michel Salim - 0.8.1-1 - Update to 0.8.1