Accepting request 395692 from home:sleep_walker:branches:system:packagemanager
- bump to 0.10.0 - add gnutls-guile as build time dependency - don't mark bash completion as %config (warning fixed) - add ExclusiveArch to restrict available architectures - remove filter for non-standard group guixbuild (it is standard now) - remove %config for bash completion script (rpmlint was fixed) distribution level and numerous bug fixed OBS-URL: https://build.opensuse.org/request/show/395692 OBS-URL: https://build.opensuse.org/package/show/system:packagemanager/guix?expand=0&rev=12
This commit is contained in:
committed by
Git OBS Bridge
parent
74ffaae492
commit
7b2a7eaddf
21
guix.spec
21
guix.spec
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package guix
|
||||
#
|
||||
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@@ -15,13 +15,14 @@
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
# if there is systemd present, systemd_requires is defined
|
||||
%define systemd_present %{defined systemd_requires}
|
||||
%define guile guile-2.0.9.tar.xz
|
||||
%define guix_builder_group guixbuild
|
||||
|
||||
Name: guix
|
||||
Version: 0.9.0
|
||||
Version: 0.10.0
|
||||
Release: 0
|
||||
Summary: GNU Package manager
|
||||
License: GPL-3.0
|
||||
@@ -42,15 +43,18 @@ Source6: armhf-linux-guile-2.0.11.tar.xz
|
||||
Source10: guix-rpmlintrc
|
||||
BuildRequires: emacs-nox
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: guile-json
|
||||
BuildRequires: gnutls-guile
|
||||
BuildRequires: guile-json
|
||||
BuildRequires: libgcrypt-devel
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: pkgconfig(bzip2)
|
||||
BuildRequires: pkgconfig(gnutls)
|
||||
BuildRequires: pkgconfig(guile-2.0) >= 2.0.7
|
||||
BuildRequires: pkgconfig(sqlite3)
|
||||
Requires: guile
|
||||
Requires(pre): %{install_info_prereq}
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
ExclusiveArch: %ix86 x86_64 %arm
|
||||
%{?systemd_requires}
|
||||
%if %{systemd_present}
|
||||
BuildRequires: systemd-rpm-macros
|
||||
@@ -69,7 +73,6 @@ cp %{SOURCE4} gnu/packages/bootstrap/x86_64-linux/%{guile}
|
||||
cp %{SOURCE5} gnu/packages/bootstrap/mips64el-linux/%{guile}
|
||||
cp %{SOURCE6} gnu/packages/bootstrap/armhf-linux/guile-2.0.11.tar.xz
|
||||
|
||||
|
||||
%build
|
||||
|
||||
%configure \
|
||||
@@ -86,10 +89,12 @@ install -d -m 0755 %{buildroot}/gnu
|
||||
install -d -m 0755 %{buildroot}/gnu/store
|
||||
%if ! %{systemd_present}
|
||||
rm -rvf %{buildroot}%{_unitdir}
|
||||
%else
|
||||
# if systemd is used, upstart files are not needed
|
||||
rm -rvf %{buildroot}%{_libdir}/upstart
|
||||
%endif
|
||||
ln -sf /usr/sbin/service %{buildroot}%{_sbindir}/rcguix-daemon
|
||||
|
||||
|
||||
%pre
|
||||
%{_sbindir}/groupadd -r %{guix_builder_group} >/dev/null 2>/dev/null || :
|
||||
for i in `seq 1 5`; do
|
||||
@@ -104,7 +109,6 @@ done
|
||||
%service_del_preun guix-daemon.service
|
||||
%endif
|
||||
|
||||
|
||||
%post
|
||||
%install_info --info-dir=%{_infodir} %{_infodir}/guix.info.gz
|
||||
%if %{systemd_present}
|
||||
@@ -122,7 +126,7 @@ done
|
||||
%doc COPYING README
|
||||
# bash completion script is not configuration file but who would argue
|
||||
# with RPM lint :b
|
||||
%config %{_sysconfdir}/bash_completion.d/guix
|
||||
%{_sysconfdir}/bash_completion.d/guix
|
||||
%{_datadir}/guile
|
||||
%{_datadir}/guix
|
||||
%{_datadir}/emacs/site-lisp/guix*
|
||||
@@ -130,6 +134,9 @@ done
|
||||
%{_sbindir}/*guix*
|
||||
%{_libexecdir}/guix
|
||||
%{_libexecdir}/guix-authenticate
|
||||
%if !0%{?systemd_present}
|
||||
%{_libdir}/upstart
|
||||
%endif
|
||||
%{_infodir}/guix*
|
||||
%{_infodir}/images
|
||||
%if %{systemd_present}
|
||||
|
Reference in New Issue
Block a user