diff --git a/vala-0.42.2.tar.xz b/vala-0.42.2.tar.xz deleted file mode 100644 index a89fe6d..0000000 Binary files a/vala-0.42.2.tar.xz and /dev/null differ diff --git a/vala-0.48.6.tar.xz b/vala-0.48.6.tar.xz new file mode 100644 index 0000000..7d0773c Binary files /dev/null and b/vala-0.48.6.tar.xz differ diff --git a/vala.spec b/vala.spec index a41e63f..25cc44e 100644 --- a/vala.spec +++ b/vala.spec @@ -1,53 +1,50 @@ -%global vala_version 0.42 -%global vala_priority 90 +%global api_ver 0.48 +%global priority 90 %global vala_binaries vala valac vala-gen-introspect vapigen %global vala_manpages valac vala-gen-introspect vapigen Name: vala -Version: 0.42.2 +Version: 0.48.6 Release: 2 Summary: Compiler Using the GObject Type System License: LGPLv2+ and BSD URL: https://wiki.gnome.org/Projects/Vala -Source0: https://download.gnome.org/sources/vala/0.42/vala-%{version}.tar.xz +Source0: https://download.gnome.org/sources/vala/0.48/vala-%{version}.tar.xz + BuildRequires: flex bison glib2-devel gobject-introspection-devel BuildRequires: graphviz-devel libxslt dbus-x11 -Requires: gobject-introspection-devel - -Requires(posttrans): %{_sbindir}/alternatives -Requires(preun): %{_sbindir}/alternatives - -Obsoletes: vala-tools < 0.34.0 valadoc -Conflicts: vala-tools < 0.34.0 - -Provides: vala-tools = %{version}-%{release} valadoc vala(api) = %{vala_version} +BuildRequires: dbus-x11 +Requires(pre): %{_sbindir}/alternatives +Requires: libvala = %{version}-%{release} gobject-introspection-devel +Requires: %{name} = %{version}-%{release} +Obsoletes: vala-tools < 0.34.0 +Conflicts: vala-tools < 0.34.0 +Provides: vala-tools = %{version}-%{release} vala(api) = %{api_ver} +Provides: valadoc = %{version}-%{release} +Obsoletes: valadoc < %{version}-%{release} %description -Vala is a programming language using modern high level abstractions without -imposing additional runtime requirements and without using a different ABI -compared to applications and libraries written in C. Vala uses the GObject -type system and has additional code generation routines that make targeting -the GNOME stack simple. Vala has many other uses where native binaries are -required. +Compiler Using the GObject Type System. -%package devel -Summary: Development package for %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} -Obsoletes: valadoc-devel -Provides: valadoc-devel +%package devel +Summary: Library and and head file for vala compiler +Requires: libvala = %{version}-%{release} valadoc = %{version}-%{release} +Provides: vala-devel = %{version}-%{release} libvala = %{version}-%{release} +Provides: libvala-devel = %{version}-%{release} valadoc-devel = %{version}-%{release} +Obsoletes: vala-devel < 0.43 libvala = %{version}-%{release} +Obsoletes: libvala-devel = %{version}-%{release} valadoc-devel = %{version}-%{release} %description devel -Provide headers and libraries for %{name} development +Library and and head file for vala compiler. -%package help -Summary: Help files for %{name} -Requires: %{name} = %{version}-%{release} -Obsoletes: %{name}-doc -Provides: %{name}-doc -BuildArch: noarch +%package help +Summary: Help documents for vala +Requires: %{name} = %{version}-%{release} devhelp +Provides: %{name}-doc = %{version}-%{release} +Obsoletes: %{name}-doc < %{version}-%{release} -%description help -This package contains user documentation for %{name}. +%description help +Help documents for vala. %prep %autosetup -n %{name}-%{version} -p1 @@ -59,96 +56,72 @@ sed -i 's|/lib /usr/lib|/lib /usr/lib /lib64 /usr/lib64|' libtool %install %make_install -for f in %{vala_binaries} -do - rm %{buildroot}%{_bindir}/$f - touch %{buildroot}%{_bindir}/$f -done -for f in %{vala_manpages} -do - rm %{buildroot}%{_mandir}/man1/$f.1* - touch %{buildroot}%{_mandir}/man1/$f.1.gz -done -mkdir -p %{buildroot}%{_datadir}/vala/vapi +install -d $RPM_BUILD_ROOT%{_datadir}/vala/vapi %delete_la %check make check %pre +if [ $1 -gt 1 ] ; then + for f in %{vala_binaries}; + do + %{_sbindir}/alternatives --remove-all $f >& /dev/null || : + done + for f in %{vala_manpages}; -%posttrans -for f in %{vala_binaries}; -do - %{_sbindir}/alternatives --install %{_bindir}/$f \ - $f %{_bindir}/$f-%{vala_version} %{vala_priority} || : -done -for f in %{vala_manpages}; -do - %{_sbindir}/alternatives --install %{_mandir}/man1/$f.1.gz \ - $f.1.gz %{_mandir}/man1/$f-%{vala_version}.1.gz %{vala_priority} || : -done - -%preun -for f in %{vala_binaries}; -do - %{_sbindir}/alternatives --remove $f \ - %{_bindir}/$f-%{vala_version} || : -done -for f in %{vala_manpages}; -do - %{_sbindir}/alternatives --remove $f.1.gz \ - %{_mandir}/man1/$f-%{vala_version}.1.gz || : -done - -%post - -%postun + do + %{_sbindir}/alternatives --remove-all $f.1.gz >& /dev/null || : + done +fi %files %license COPYING -%ghost %{_bindir}/vala -%ghost %{_bindir}/valac -%ghost %{_bindir}/vala-gen-introspect -%ghost %{_bindir}/vapigen -%{_bindir}/vala-%{vala_version} -%{_bindir}/valac-%{vala_version} -%{_bindir}/vala-gen-introspect-%{vala_version} -%{_bindir}/vapigen-%{vala_version} -%{_bindir}/valadoc -%{_bindir}/valadoc-%{vala_version} +%{_bindir}/vala +%{_bindir}/vala-%{api_ver} +%{_bindir}/valac +%{_bindir}/valac-%{api_ver} +%{_bindir}/vala-gen-introspect +%{_bindir}/vala-gen-introspect-%{api_ver} +%{_bindir}/vapigen +%{_bindir}/vapigen-%{api_ver} %{_libdir}/pkgconfig/vapigen*.pc -%{_libdir}/vala-%{vala_version}/ -%{_libdir}/libvala-%{vala_version}.so.* -%{_libdir}/libvaladoc-%{vala_version}.so.0* -%{_libdir}/valadoc/ +%{_libdir}/vala-%{api_ver}/ %{_datadir}/aclocal/vala.m4 %{_datadir}/aclocal/vapigen.m4 %{_datadir}/vala/ -%{_datadir}/vala-%{vala_version}/ -%{_datadir}/valadoc/ +%{_datadir}/vala-%{api_ver}/ +%{_bindir}/valadoc +%{_bindir}/valadoc-%{api_ver} +%{_libdir}/libvaladoc-%{api_ver}.so.0* +%{_libdir}/valadoc-%{api_ver}/ +%{_datadir}/valadoc-%{api_ver}/ %files devel -%{_includedir}/vala-%{vala_version} -%{_libdir}/libvala-%{vala_version}.so -%{_libdir}/pkgconfig/libvala-%{vala_version}.pc -%{_includedir}/valadoc-%{vala_version}/ -%{_libdir}/libvaladoc-%{vala_version}.so -%{_libdir}/pkgconfig/valadoc-%{vala_version}.pc +%license COPYING +%{_libdir}/libvala-%{api_ver}.so.* +%{_includedir}/vala-%{api_ver} +%{_libdir}/libvala-%{api_ver}.so +%{_libdir}/pkgconfig/libvala-%{api_ver}.pc +%{_includedir}/valadoc-%{api_ver}/ +%{_libdir}/libvaladoc-%{api_ver}.so +%{_libdir}/pkgconfig/valadoc-%{api_ver}.pc %files help -%doc %{_datadir}/devhelp/books/vala-%{vala_version} -%ghost %{_mandir}/man1/valac.1.gz -%ghost %{_mandir}/man1/vala-gen-introspect.1.gz -%ghost %{_mandir}/man1/vapigen.1.gz -%{_mandir}/man1/valac-%{vala_version}.1.gz -%{_mandir}/man1/vala-gen-introspect-%{vala_version}.1.gz -%{_mandir}/man1/vapigen-%{vala_version}.1.gz -%{_mandir}/man1/valadoc-%{vala_version}.1* +%{_mandir}/man1/valac.1* +%{_mandir}/man1/valac-%{api_ver}.1* +%{_mandir}/man1/vala-gen-introspect.1* +%{_mandir}/man1/vala-gen-introspect-%{api_ver}.1* +%{_mandir}/man1/vapigen.1* +%{_mandir}/man1/vapigen-%{api_ver}.1* +%{_mandir}/man1/valadoc-%{api_ver}.1* %{_mandir}/man1/valadoc.1* +%doc %{_datadir}/devhelp/books/vala-%{api_ver} %changelog +* Wed Jun 3 2020 wutao - 0.48.6-2 +- Upagrade to 0.48.6-2 + * Mon Dec 9 2019 openEuler Buildteam - 0.42.2-2 - Package init -