Update to 2.1.6

Ensure that the license is always installed.

.gitignore

@@ -18,3 +18,4 @@
 /udisks-2.1.3.tar.bz2
 /udisks-2.1.4.tar.bz2
 /udisks-2.1.5.tar.bz2
+/udisks-2.1.6.tar.bz2

sources

@@ -1 +1 @@
-73632501002e6de8244f831e38b2b98e  udisks-2.1.5.tar.bz2
+ea181c13c43af039fded88f0ef546e24  udisks-2.1.6.tar.bz2

udisks2.spec

@@ -1,3 +1,5 @@
+%global _hardened_build 1
+
 %global glib2_version                   2.36
 %global gobject_introspection_version   1.30.0
 %global polkit_version                  0.102
@@ -7,7 +9,7 @@
 
 Summary: Disk Manager
 Name: udisks2
-Version: 2.1.5
+Version: 2.1.6
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
@@ -25,6 +27,10 @@ BuildRequires: chrpath
 BuildRequires: gtk-doc
 BuildRequires: intltool
 
+# For systemd scriptlet snippets.
+Requires(post): systemd
+Requires(preun): systemd
+Requires(postun): systemd
 # needed to pull in the system bus daemon
 Requires: dbus >= %{dbus_version}
 # needed to pull in the udev daemon
@@ -50,7 +56,7 @@ Requires: eject
 # for MD-RAID
 Requires: mdadm
 
-Requires: libudisks2 = %{version}-%{release}
+Requires: libudisks2%{?_isa} = %{version}-%{release}
 
 # for mkntfs (not available on rhel or on ppc/ppc64)
 %if ! 0%{?rhel}
@@ -81,8 +87,7 @@ series.
 %package -n libudisks2-devel
 Summary: Development files for libudisks2
 Group: Development/Libraries
-Requires: libudisks2 = %{version}-%{release}
-Requires: pkgconfig
+Requires: libudisks2%{?_isa} = %{version}-%{release}
 License: LGPLv2+
 
 %description -n libudisks2-devel
@@ -94,62 +99,69 @@ daemon. This package is for the udisks 2.x series.
 %setup -q -n udisks-%{version}
 
 %build
-# we can't use _hardened_build here, see
-# https://bugzilla.redhat.com/show_bug.cgi?id=892837
-export CFLAGS='-fPIC %optflags'
-export LDFLAGS='-pie -Wl,-z,now -Wl,-z,relro'
 %configure --enable-gtk-doc
 # the following rpath workaround causes build breakage due to wrong library path while performing GIR introspection dump
 # sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 # sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-make
+make %{?_smp_mflags}
+
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 
 chrpath --delete $RPM_BUILD_ROOT%{_sbindir}/umount.udisks2
 chrpath --delete $RPM_BUILD_ROOT%{_bindir}/udisksctl
-chrpath --delete $RPM_BUILD_ROOT%{_prefix}/lib/udisks2/udisksd
+chrpath --delete $RPM_BUILD_ROOT%{_libexecdir}/udisks2/udisksd
 
 %find_lang %{name}
 
+
+%check
+make check
+
+
+%post
+%systemd_post udisks2.service
+
+%preun
+%systemd_preun udisks2.service
+
+%postun
+%systemd_postun_with_restart udisks2.service
+
 %post -n libudisks2 -p /sbin/ldconfig
 
 %postun -n libudisks2 -p /sbin/ldconfig
 
+
 %files -f %{name}.lang
 %doc README AUTHORS NEWS HACKING
-%license COPYING
-
 %dir %{_sysconfdir}/udisks2
-
 %{_sysconfdir}/dbus-1/system.d/org.freedesktop.UDisks2.conf
 %{_datadir}/bash-completion/completions/udisksctl
 %{_prefix}/lib/systemd/system/udisks2.service
 %{_prefix}/lib/udev/rules.d/80-udisks2.rules
 %{_sbindir}/umount.udisks2
-
-%dir %{_prefix}/lib/udisks2
-%{_prefix}/lib/udisks2/udisksd
-
+%dir %{_libexecdir}/udisks2
+%{_libexecdir}/udisks2/udisksd
 %{_bindir}/udisksctl
-
 %{_mandir}/man1/udisksctl.1*
 %{_mandir}/man8/udisks.8*
 %{_mandir}/man8/udisksd.8*
 %{_mandir}/man8/umount.udisks2.8*
-
 %{_datadir}/polkit-1/actions/org.freedesktop.udisks2.policy
 %{_datadir}/dbus-1/system-services/org.freedesktop.UDisks2.service
-
 # Permissions for local state data are 0700 to avoid leaking information
 # about e.g. mounts to unprivileged users
 %attr(0700,root,root) %dir %{_localstatedir}/lib/udisks2
 
 %files -n libudisks2
+# The COPYING file contains both the GPL (daemon and tools) and LGPL (library
+# and development headers).
+%license COPYING
 %{_libdir}/libudisks2.so.*
 %{_libdir}/girepository-1.0/UDisks-2.0.typelib
 
@@ -163,15 +175,28 @@ chrpath --delete $RPM_BUILD_ROOT%{_prefix}/lib/udisks2/udisksd
 %{_datadir}/gtk-doc/html/udisks2/*
 %{_libdir}/pkgconfig/udisks2.pc
 
-# Note: please don't forget the %{?dist} in the changelog. Thanks
 %changelog
+* Tue Jun 30 2015 David King <amigadave@amigadave.com> - 2.1.6-1
+- Update to 2.1.6
+
+* Thu Apr 23 2015 David King <amigadave@amigadave.com> - 2.1.5-3
+- Call make check during check phase
+- Move license to libudisks2 subpackage
+- Preserve timestamps during install
+
+* Wed Apr 22 2015 David King <amigadave@amigadave.com> - 2.1.5-2
+- Use systemd scriptlet snippets (#857409)
+
 * Fri Mar 06 2015 David King <amigadave@amigadave.com> - 2.1.5-1
 - Update to 2.1.5
 - Use license macro for COPYING
 - Update man page globs in file section
 - Use pkgconfig for BuildRequires
+- Drop obsolete hardened workaround
+- Enable multiple make jobs when building
+- Tighten subpackage dependencies
 
-* Fri Jan 30 2015 Tomas Bzatek <tbzatek@redhat.com> - 2.1.4-1%{?dist}
+* Fri Jan 30 2015 Tomas Bzatek <tbzatek@redhat.com> - 2.1.4-1
 - Update to 2.1.4
 
 * Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.3-4
@@ -183,23 +208,23 @@ chrpath --delete $RPM_BUILD_ROOT%{_prefix}/lib/udisks2/udisksd
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
-* Thu Mar 27 2014 Tomas Bzatek <tbzatek@redhat.com> - 2.1.3-1%{?dist}
+* Thu Mar 27 2014 Tomas Bzatek <tbzatek@redhat.com> - 2.1.3-1
 - Update to 2.1.3
 
-* Mon Mar 10 2014 Jan Safranek <jsafrane@redhat.com>- 2.1.2-2%{?dist}
+* Mon Mar 10 2014 Jan Safranek <jsafrane@redhat.com>- 2.1.2-2
 - Fix CVE-2014-0004: stack-based buffer overflow when handling long path names
   (#1074459)
 
-* Wed Jan 15 2014 Tomas Bzatek <tbzatek@redhat.com> - 2.1.2-1%{?dist}
+* Wed Jan 15 2014 Tomas Bzatek <tbzatek@redhat.com> - 2.1.2-1
 - Update to 2.1.2
 
-* Wed Aug 21 2013 Tomas Bzatek <tbzatek@redhat.com> - 2.1.1-1%{?dist}
+* Wed Aug 21 2013 Tomas Bzatek <tbzatek@redhat.com> - 2.1.1-1
 - Update to 2.1.1
 
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
-* Thu Mar 28 2013 Tomas Bzatek <tbzatek@redhat.com> - 2.1.0-2%{?dist}
+* Thu Mar 28 2013 Tomas Bzatek <tbzatek@redhat.com> - 2.1.0-2
 - Fix firewire drives identification (#909010)
 
 * Wed Mar 20 2013 Kalev Lember <kalevlember@gmail.com> - 2.1.0-1
@@ -208,25 +233,25 @@ chrpath --delete $RPM_BUILD_ROOT%{_prefix}/lib/udisks2/udisksd
 * Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.91-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
-* Tue Jan 22 2013 Matthias Clasen <mclasen@redhat.com> - 2.0.91-2%{?dist}
+* Tue Jan 22 2013 Matthias Clasen <mclasen@redhat.com> - 2.0.91-2
 - Hardened build
 
-* Mon Jan 07 2013 David Zeuthen <davidz@redhat.com> - 2.0.91-1%{?dist}
+* Mon Jan 07 2013 David Zeuthen <davidz@redhat.com> - 2.0.91-1
 - Update to release 2.0.91
 
-* Tue Dec 18 2012 David Zeuthen <davidz@redhat.com> - 2.0.90-1%{?dist}
+* Tue Dec 18 2012 David Zeuthen <davidz@redhat.com> - 2.0.90-1
 - Update to release 2.0.90
 
-* Fri Oct 02 2012 David Zeuthen <davidz@redhat.com> - 2.0.0-1%{?dist}
+* Tue Oct 02 2012 David Zeuthen <davidz@redhat.com> - 2.0.0-1
 - Update to release 2.0.0
 
-* Fri Jul 27 2012 David Zeuthen <davidz@redhat.com> - 1.99.0-1%{?dist}
+* Fri Jul 27 2012 David Zeuthen <davidz@redhat.com> - 1.99.0-1
 - Update to release 1.99.0
 
 * Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.98.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
-* Thu Jun 07 2012 David Zeuthen <davidz@redhat.com> - 1.98.0-1%{?dist}
+* Thu Jun 07 2012 David Zeuthen <davidz@redhat.com> - 1.98.0-1
 - Update to release 1.98.0
 
 * Mon Jun 04 2012 Kay Sievers <kay@redhat.com> - 1.97.0-4
@@ -235,62 +260,62 @@ chrpath --delete $RPM_BUILD_ROOT%{_prefix}/lib/udisks2/udisksd
 * Tue May 22 2012 Peter Robinson <pbrobinson@fedoraproject.org> - 1.97.0-3
 - Add upstream patch to fix issue with rootfs being on a bound mount
 
-* Fri May 18 2012 Matthias Clasen <mclasen@redhat.com> - 1.97.0-2%{?dist}
+* Fri May 18 2012 Matthias Clasen <mclasen@redhat.com> - 1.97.0-2
 - Add a Requires for eject (#810882)
 
-* Wed May 09 2012 David Zeuthen <davidz@redhat.com> - 1.97.0-1%{?dist}
+* Wed May 09 2012 David Zeuthen <davidz@redhat.com> - 1.97.0-1
 - Update to release 1.97.0
 
-* Thu May 03 2012 David Zeuthen <davidz@redhat.com> - 1.96.0-2%{?dist}
+* Thu May 03 2012 David Zeuthen <davidz@redhat.com> - 1.96.0-2
 - Include patch so Fedora Live media is shown
 
-* Mon Apr 30 2012 David Zeuthen <davidz@redhat.com> - 1.96.0-1%{?dist}
+* Mon Apr 30 2012 David Zeuthen <davidz@redhat.com> - 1.96.0-1
 - Update to release 1.96.0
 
-* Mon Apr 30 2012 David Zeuthen <davidz@redhat.com> - 1.95.0-3%{?dist}
+* Mon Apr 30 2012 David Zeuthen <davidz@redhat.com> - 1.95.0-3
 - BR: gnome-common
 
-* Mon Apr 30 2012 David Zeuthen <davidz@redhat.com> - 1.95.0-2%{?dist}
+* Mon Apr 30 2012 David Zeuthen <davidz@redhat.com> - 1.95.0-2
 - Make daemon actually link with libsystemd-login
 
-* Mon Apr 30 2012 David Zeuthen <davidz@redhat.com> - 1.95.0-1%{?dist}
+* Mon Apr 30 2012 David Zeuthen <davidz@redhat.com> - 1.95.0-1
 - Update to release 1.95.0
 
-* Tue Apr 10 2012 David Zeuthen <davidz@redhat.com> - 1.94.0-1%{?dist}
+* Tue Apr 10 2012 David Zeuthen <davidz@redhat.com> - 1.94.0-1
 - Update to release 1.94.0
 
-* Tue Apr 03 2012 David Zeuthen <davidz@redhat.com> - 1.93.0-2%{?dist}
+* Tue Apr 03 2012 David Zeuthen <davidz@redhat.com> - 1.93.0-2
 - Don't inadvertently unmount large block devices (fdo #48155)
 
-* Mon Mar 05 2012 David Zeuthen <davidz@redhat.com> - 1.93.0-1%{?dist}
+* Mon Mar 05 2012 David Zeuthen <davidz@redhat.com> - 1.93.0-1
 - Update to release 1.93.0
 
-* Thu Feb 23 2012 David Zeuthen <davidz@redhat.com> - 1.92.0-2%{?dist}
+* Thu Feb 23 2012 David Zeuthen <davidz@redhat.com> - 1.92.0-2
 - Fix build
 
-* Thu Feb 23 2012 David Zeuthen <davidz@redhat.com> - 1.92.0-1%{?dist}
+* Thu Feb 23 2012 David Zeuthen <davidz@redhat.com> - 1.92.0-1
 - Update to release 1.92.0
 
-* Wed Feb 22 2012 David Zeuthen <davidz@redhat.com> - 1.91.0-2%{?dist}
+* Wed Feb 22 2012 David Zeuthen <davidz@redhat.com> - 1.91.0-2
 - Avoid using $XDG_RUNTIME_DIR/media for now
 
-* Mon Feb 06 2012 David Zeuthen <davidz@redhat.com> - 1.91.0-1%{?dist}
+* Mon Feb 06 2012 David Zeuthen <davidz@redhat.com> - 1.91.0-1
 - Update to release 1.91.0
 
-* Fri Jan 21 2012 David Zeuthen <davidz@redhat.com> - 1.90.0-3%{?dist}
+* Sat Jan 21 2012 David Zeuthen <davidz@redhat.com> - 1.90.0-3
 - Manually set PATH, if not set
 
-* Fri Jan 20 2012 David Zeuthen <davidz@redhat.com> - 1.90.0-2%{?dist}
+* Fri Jan 20 2012 David Zeuthen <davidz@redhat.com> - 1.90.0-2
 - Rebuild
 
-* Fri Jan 20 2012 David Zeuthen <davidz@redhat.com> - 1.90.0-1%{?dist}
+* Fri Jan 20 2012 David Zeuthen <davidz@redhat.com> - 1.90.0-1
 - Update to release 1.90.0
 
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.90.0-0.git20111128.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
-* Mon Nov 28 2011 David Zeuthen <davidz@redhat.com> - 1.90.0-0.git20111128%{?dist}
+* Mon Nov 28 2011 David Zeuthen <davidz@redhat.com> - 1.90.0-0.git20111128
 - Updated for review comments (#756046)
 
-* Mon Nov 22 2011 David Zeuthen <davidz@redhat.com> - 1.90.0-0.git20111122%{?dist}
+* Tue Nov 22 2011 David Zeuthen <davidz@redhat.com> - 1.90.0-0.git20111122
 - Initial packaging of udisks2