Accepting request 335655 from home:sleep_walker:branches:system:packagemanager

- use pkgconfig dependencies
- clean-up with spec-cleaner

- force installation of service file to %{_unitdir}
- use systemd related code only when systemd is available in distro

- bump to 0.8.3
  - a lot of changes on package management level, package set level,
    distribution level and numerous bug fixed  
- remove our service file and use upstream one instead

OBS-URL: https://build.opensuse.org/request/show/335655
OBS-URL: https://build.opensuse.org/package/show/system:packagemanager/guix?expand=0&rev=4

guix-0.8.2.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ff1380a551f8ba18057f7c5e8fdbcc6a371c89817718ff4b7ceef013e0b4afa8
-size 11344180

guix-0.8.2.tar.gz.sig

@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQIcBAABCAAGBQJVU86nAAoJEAkLEZk9muu1QTMP+wSYEuyu+xBdzWjmS1ZjJCTO
-M/b/XmgJdAf6MLUwXOGB5hIjUAP3VE9CSIRFDbjyAFsRed9ahYjQzjH0Gk0MFzb4
-ml2APZnoa1Mh+XDHvEpnsypLUZGpxHAywKtSH0tVKy8kQ9KAiStPrtKJgIJcsmx/
-Q9SS5cZV0xjxp8p+liN5mHF4Ylo8/J8LkGPDAGEuBiGot8fn8uYQQiXkkFTKg6fo
-tWOKy18Mw94hzzrQUF6ljVSnEn/+1DRpvlVmUQU+LJxY2c8oA1ARV5XziV0XG3vS
-jM806ryIZIBwsjenlUUqprS5MUJ4hHxO0iNyeQCsRMWL9v2GZQvx4+YjgghY8DN9
-/RK77tmo/MoWGmn4qZAg9jAyeJo2BV27QpHJPbMxG2zVF86ZDmuKGHSYVKbhncm3
-HgWoNQmRs/RBEGM5lAtj8Icxvlwskn7ZGjeAbbLDyAm8K7LwABHvykBoQbLJ6Rt6
-JvcdRqoQeTKd6Wz+QrMjd1RCQnvaAJWtCbQtFHnKvurhKg3kSIwWGiSQS/j/bMs/
-1ZdxjsAimtxnUKV88HCqEqOqPUsuEIhGjePXAXgkx7TRfwAxqxqvTT+Dib3Pop4x
-GRVHMoapkZRyc5SC/8g7LSHAeG/jFjO6dGR8s7VDjQcyRBEkKwSV2tm/fh+xMjUt
-gwLaBUhnR5AgsvXLhnCO
-=ZfJX
------END PGP SIGNATURE-----

guix-0.8.3.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dfea48f13e6584db812c24746467eb21cb0553a2f5860e1fe40d4e06e4b4c092
+size 12506789

guix-0.8.3.tar.gz.sig

@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAABCAAGBQJVrrM4AAoJEAkLEZk9muu15TQP/0PvFttwKaUHccSEZcVincki
+I9JtWqTDos0gt6aX3f7iXLw1GgNYB379yZ2p0xasdVPol0m8qQgNF7ly8B7es8Oy
+2ugziAtvG1rGG9WCYRG2I8ANVKpc9rXXcMuP3pHIc4P2MpWYlT1Dv4t4e3Q8Tl5c
+XEMhaEveCTEBv3nksndBj+RjfgRwQ28b2It7KDWnwM61vsOjTUULFGIj/mubzWnD
+W+Vo3c7rpAGbyVVGqv0ZukynsgVNmtdFCr5adesRpIHcIgCXNFoFfBxp1KwyR9FI
+2+XWiTisCuofeiwjKXtIbsYnS3AGdI13empHbxWCfVJtIzCfSOKNnT3Mq/FslKkZ
+g57sHQB16Hq58WFFzZu9JA/mBtqjGPcG1vy3rWhWIUrLnLtXrxs3t/tCob5d8FR1
+X6gLPwsDlwpXF1FWxEHev+KnZgsoS2iQLXPo3yCx5lrDyaTTwksOWwVq/8MiWbVJ
+iB6U+AO5gqcth+8C4bHAbTVc43n6idPxHsIvoN9+tvuvOddLWOsamZMoh5jgd6oG
+y0lfxgRM7jb6UShXye9XSVTENjeSfH8ECmg6LHNCjMsFAm5TwFaoQh/v/37w1LIt
+nznrlBfxfl2kHPaJwzc8hBBRQpQdwJCuISIuegCWYu4EmDcn/M7tlTt6UcqfrrJz
+8lAQhs7uvuxdWFOwzGwv
+=Jey5
+-----END PGP SIGNATURE-----

guix.changes

@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Thu Oct  1 21:18:37 UTC 2015 - sleep_walker@opensuse.org
+
+- use pkgconfig dependencies
+- clean-up with spec-cleaner
+
+-------------------------------------------------------------------
+Thu Oct  1 20:15:35 UTC 2015 - sleep_walker@opensuse.org
+
+- force installation of service file to %{_unitdir}
+- use systemd related code only when systemd is available in distro
+
+-------------------------------------------------------------------
+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  
+- remove our service file and use upstream one instead
+
 -------------------------------------------------------------------
 Thu May 14 11:57:47 UTC 2015 - sleep_walker@suse.cz
 

guix.spec

@@ -15,10 +15,12 @@
 # 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
+
 Name:           guix
-Version:        0.8.2
+Version:        0.8.3
 Release:        0
 Summary:        GNU Package manager
 License:        GPL-3.0
@@ -36,26 +38,30 @@ Source4:        x86_64-linux-%{guile}
 Source5:        mips64el-linux-%{guile}
 # http://alpha.gnu.org/gnu/guix/bootstrap/armhf-linux/20150101/guile-2.0.11.tar.xz
 Source6:        armhf-linux-guile-2.0.11.tar.xz
-Source10:       guixd.service
+#Source10:       guixd.service
 Source11:       sysconfig.guix
 BuildRequires:  gcc-c++
-BuildRequires:  guile-devel
-BuildRequires:  libbz2-devel
 BuildRequires:  libgcrypt-devel
 BuildRequires:  pkgconfig
-BuildRequires:  sqlite3-devel
+BuildRequires:  pkgconfig(bzip2)
-BuildRequires:  systemd-rpm-macros
+BuildRequires:  pkgconfig(guile-2.0) >= 2.0.7
+BuildRequires:  pkgconfig(sqlite3)
 Requires:       guile
 Requires:       libgcrypt-devel
 Requires(pre):  %{install_info_prereq}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %{?systemd_requires}
+%if %{systemd_present}
+BuildRequires:  systemd-rpm-macros
+%endif
 
 %description
 Purely functional package manager and a distribution thereof.
 
 %prep
 %setup -q
+# install service file to _unitdir
+sed -i 's@\$(libdir)/systemd/system@%{_unitdir}@' Makefile.in
 mkdir -p gnu/packages/bootstrap/{i686,x86_64,mips64el,armhf}-linux
 cp %{SOURCE3} gnu/packages/bootstrap/i686-linux/%{guile}
 cp %{SOURCE4} gnu/packages/bootstrap/x86_64-linux/%{guile}
@@ -74,11 +80,12 @@ make %{?_smp_mflags}
 make DESTDIR=%{buildroot} install %{?_smp_mflags}
 %find_lang %{name}
 %find_lang guix-packages
-install -d -m 0755 %{buildroot}%{_unitdir}
-install -D -m 0644 -t %{buildroot}%{_unitdir} %{SOURCE10}
 install -d -m 0755 %{buildroot}%{_localstatedir}/adm/fillup-templates/
 install -D -m 0644 -t %{buildroot}%{_localstatedir}/adm/fillup-templates/ %{SOURCE11}
 rm %{buildroot}%{_infodir}/dir
+%if ! %{systemd_present}
+rm -rvf %{buildroot}%{_unitdir}
+%endif
 
 %pre
 %{_sbindir}/groupadd -r guix-builders >/dev/null 2>/dev/null || :
@@ -86,20 +93,26 @@ for i in `seq 1 5`; do
     %{_sbindir}/useradd -r -o -g guix-builders -G guix-builders -u $((60+$i)) -c "Guix builder $i" \
                   -s /sbin/nologin -d %{_localstatedir}/empty guix-builder$i 2> /dev/null || :
 done
-%service_add_pre guixd.service
+%if %{systemd_present}
+%service_add_pre guix-daemon.service
 
 %preun
-%service_del_preun guixd.service
+%service_del_preun guix-daemon.service
+%endif
+
 
 %post
 %install_info --info-dir=%{_infodir} %{_infodir}/guix.info.gz
-%service_add_post guixd.service
 %{fillup_only guixd}
+%if %{systemd_present}
+%service_add_post guix-daemon.service
+%endif
 
 %postun
 %install_info_delete --info-dir=%{_infodir} %{_infodir}/guix.info.gz
-%service_del_postun guixd.service
+%if %{systemd_present}
-
+%service_del_postun guix-daemon.service
+%endif
 
 %files -f %{name}.lang -f guix-packages.lang
 %defattr(-,root,root)
@@ -113,7 +126,10 @@ done
 %{_libexecdir}/guix-authenticate
 %{_infodir}/guix*
 %{_infodir}/images
-%{_unitdir}/guixd.service
+%if %{systemd_present}
+%{_unitdir}/guix*.service
+%endif
+%{_mandir}/man1/guix*
 %{_localstatedir}/adm/fillup-templates/*
 
 %changelog

guixd.service

@@ -1,11 +0,0 @@
-[Unit]
-Description=Guix build daemons
-
-[Service]
-Type=simple
-PIDFile=/var/run/guixd.pid
-EnvironmentFile=/etc/sysconfig/guix
-ExecStart=/usr/bin/guix-daemon --cores $GUIX_BUILDER_CORES --build-users-group $GUIX_BUILDER_GROUP 
-
-[Install]
-WantedBy=multiuser.target