rpms/vala/F-12 .cvsignore, 1.29, 1.30 sources, 1.29, 1.30 vala.spec, 1.47, 1.48
Michel Alexandre Salim
salimma at fedoraproject.org
Sat Jul 3 14:39:10 UTC 2010
- Previous message: rpms/vala/EL-6 .cvsignore, 1.29, 1.30 sources, 1.29, 1.30 vala.spec, 1.47, 1.48
- Next message: rpms/vala/F-13 .cvsignore, 1.30, 1.31 sources, 1.30, 1.31 vala.spec, 1.48, 1.49
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: salimma
Update of /cvs/pkgs/rpms/vala/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv30551/F-12
Modified Files:
.cvsignore sources vala.spec
Log Message:
Push vala-0.9.2 to stable Fedora releases and EL-6
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vala/F-12/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- .cvsignore 27 Apr 2010 21:32:02 -0000 1.29
+++ .cvsignore 3 Jul 2010 14:39:10 -0000 1.30
@@ -1 +1 @@
-vala-0.8.1.tar.bz2
+vala-0.9.2.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vala/F-12/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- sources 27 Apr 2010 21:32:02 -0000 1.29
+++ sources 3 Jul 2010 14:39:10 -0000 1.30
@@ -1 +1 @@
-3e105d7f39e55925299a3e6e82c32de7 vala-0.8.1.tar.bz2
+583f2c46da49f54e4f639eb706475abe vala-0.9.2.tar.bz2
Index: vala.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vala/F-12/vala.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- vala.spec 27 Apr 2010 21:32:02 -0000 1.47
+++ vala.spec 3 Jul 2010 14:39:10 -0000 1.48
@@ -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}.2
Release: 1%{?dist}
Summary: A modern programming language for GNOME
@@ -22,13 +9,14 @@ 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
+#VCS: git:git://git.gnome.org/vala
+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 +89,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 +129,7 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpa
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 +143,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 +181,27 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root,-)
%{_datadir}/devhelp/books/vala
-%files -n emacs-vala
+%files -n emacs-%{name}
+%defattr(-,root,root,-)
+%dir %{_emacs_sitelispdir}/%{name}
+%{_emacs_sitelispdir}/%{name}/*.elc
+%{_emacs_sitestartdir}/*.el
+
+%files -n emacs-%{name}-el
%defattr(-,root,root,-)
-%{emacs_lispdir}/*.el*
-%{emacs_startdir}/*
+%{_emacs_sitelispdir}/%{name}/*.el
%changelog
+* Sat Jul 3 2010 Michel Salim <salimma at fedoraproject.org> - 0.9.2-1
+- Update to 0.9.2
+
+* Sun Jun 13 2010 Michel Salim <salimma at fedoraproject.org> - 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 <salimma at fedoraproject.org> - 0.8.1-1
- Update to 0.8.1
- Previous message: rpms/vala/EL-6 .cvsignore, 1.29, 1.30 sources, 1.29, 1.30 vala.spec, 1.47, 1.48
- Next message: rpms/vala/F-13 .cvsignore, 1.30, 1.31 sources, 1.30, 1.31 vala.spec, 1.48, 1.49
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list