From 7b2a7eaddf394767934d4df027329cc2c164fce8bdd2513a5f8df6c9cca905e2 Mon Sep 17 00:00:00 2001 From: Tomas Cech Date: Sun, 15 May 2016 18:30:50 +0000 Subject: [PATCH] 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 --- guix-0.10.0.tar.gz | 3 +++ guix-0.10.0.tar.gz.sig | 17 +++++++++++++++++ guix-0.9.0.tar.gz | 3 --- guix-0.9.0.tar.gz.sig | 17 ----------------- guix.changes | 16 +++++++++++++++- guix.spec | 21 ++++++++++++++------- 6 files changed, 49 insertions(+), 28 deletions(-) create mode 100644 guix-0.10.0.tar.gz create mode 100644 guix-0.10.0.tar.gz.sig delete mode 100644 guix-0.9.0.tar.gz delete mode 100644 guix-0.9.0.tar.gz.sig diff --git a/guix-0.10.0.tar.gz b/guix-0.10.0.tar.gz new file mode 100644 index 0000000..1b866f1 --- /dev/null +++ b/guix-0.10.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7651a4025fe9798947e16d671b74d49a434dd4238cefbfc82411df753c778a34 +size 15316453 diff --git a/guix-0.10.0.tar.gz.sig b/guix-0.10.0.tar.gz.sig new file mode 100644 index 0000000..1725d46 --- /dev/null +++ b/guix-0.10.0.tar.gz.sig @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iQIcBAABCAAGBQJW+aFeAAoJEAkLEZk9muu1e38P/0zbm7/pwvNrXxrVCvQCMJqy +mFKbXvbREpS9VHHCwgaGWN/6/1VlGlzbL50D0H/wYjbG9tpcqfOVOzmiUPoBKWpw +qdfN/P3/1i//lx7QDdz8DfBmcAiyRLY/ABjtXOuZfG+trPVGi8fh9ZqB2nnhNkxB +Erxl6YrVon64l8gkeoLX8pxuS6MZCvMqW957bFBc2RK952+rzw8m7qivYFehKlyS +2JOYzIr2uawM65GTbhQkRsmzbbzw5Y9vKBhhm3h7EKZWCeMepT56K8S9s9rHFE+B +/ZJiZ81jzz1q6R3TjLWx9aH36AZFQA46LCc1uLkQi76G1JlLB/kIw4Q8cY1CFfZ9 +zeiIQxcC42nc2Ab51o0VXLqNJfc+Mgjm98t1gYUAyTrZtX/9ZFU9V3NRL6Iu/p3F +ze0GKEbESbh2JO2M2VEEQhsMpEYKYDd/0k3AcVwYWi7TQtcxHdq6TcUr9HSD7xn+ +b+6DKNztpnZTJGXbrpl7I0S5vlUiuLH714q3vQkOeLdqbN+bZ4Z17vjDgYmpFbZ1 +89fdBBzdl+4B7O6NpF9cHJttJNtYrSMCqJQ6wBuWtVLOttmlhSgv9HU+Zg2T59Uo +6QZ3GauWfxx3VoGQRLGYeFEA0claAQhRdAfE8RihWQKVtJpnpyUCdE+68AE5MV0Z +4oHM0KQ+qpjBAbz4YE9k +=xfwZ +-----END PGP SIGNATURE----- diff --git a/guix-0.9.0.tar.gz b/guix-0.9.0.tar.gz deleted file mode 100644 index 554592f..0000000 --- a/guix-0.9.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:362f354d15385ec1866e5687f707f1c30e50694f2a7edff5206e81bcc41fa740 -size 14058212 diff --git a/guix-0.9.0.tar.gz.sig b/guix-0.9.0.tar.gz.sig deleted file mode 100644 index 7ed13b4..0000000 --- a/guix-0.9.0.tar.gz.sig +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQIcBAABCAAGBQJWOfjFAAoJEAkLEZk9muu1XaoQAJP9kGqW0eAcePvEqzoo7sPC -RJmuhPXUItkM9yPELraRvy+rq2RbpJWLTEt3Oy+jsHUTsQokIq+GhD9Y1QHRsRM0 -2hdCOtiUojppseO7vASVLqfWFkNN6RDIJ0UJ5otSB87RnGkxS4MY794M6Lem/76/ -abkXEv1G6oZqjld4RUVgG4eWPT0WYs2m+ct4YfkherZwHG8JL/Px7AqrH8HWh1qk -kj8zJFmWVZjXQRPTBYpNus5MNto3/Bbcs2CpQH3x4DackdIr15nBNBNlDNZwyKHb -HTbVFb0JPg+6aC15a+2rB+BBK0gmQvza/S9GnjMH8jMNJZM0RhYx7OmeMmXvy+VK -GYYzlUNTVe3lLetRJ0dQSyec/jNM9SqLIv1Srm1DVSENdMX72yeNN1DRgdiEe6Gc -d4KGKqPMzFn6nEulJrjxSLdJz3PeZG6deeqLmj/VlaXaR4SsfZMxCTrK6Fe5R7+P -ZwPMWhnbHd3WNzLsyvPs0LnhFCUqvRAbU1eTLiH/CfvLj62/z1YdFMWA/8X/OnAS -TV0phCZBA2VS7MJCJwSGckdhOWHzFAHZZFktUQRhsMUnJDms36lPwlHXTvinTHkQ -JzPelxLoIr+LHuTPpa1oyf/rdcEW5LzvnIcxpKJk5YljgipLqNECQXo+QYOFNBG/ -2rBvxlqeyw9qDiiD8Dd8 -=2gGw ------END PGP SIGNATURE----- diff --git a/guix.changes b/guix.changes index e0ad980..cb5bd6d 100644 --- a/guix.changes +++ b/guix.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Sat Apr 16 08:35:22 UTC 2016 - sleep_walker@opensuse.org + +- bump to 0.10.0 +- add gnutls-guile as build time dependency +- don't mark bash completion as %config (warning fixed) + +------------------------------------------------------------------- +Fri Feb 12 11:51:04 UTC 2016 - sleep_walker@opensuse.org + +- 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) + ------------------------------------------------------------------- Fri Feb 12 09:18:04 UTC 2016 - sleep_walker@opensuse.org @@ -51,7 +65,7 @@ Thu Oct 1 10:22:34 UTC 2015 - sleep_walker@opensuse.org - bump to 0.8.3 - a lot of changes on package management level, package set level, - distribution level and numerous bug fixed + distribution level and numerous bug fixed - remove our service file and use upstream one instead ------------------------------------------------------------------- diff --git a/guix.spec b/guix.spec index 1c5925e..f4b4f05 100644 --- a/guix.spec +++ b/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}