Accepting request 289695 from home:XRevan86

- Update to 2.1.5.
- Add recommended /usr/sbin/rcudisks2 service alias.
- Remove obsolete definitions.

OBS-URL: https://build.opensuse.org/request/show/289695
OBS-URL: https://build.opensuse.org/package/show/Base:System/udisks2?expand=0&rev=45

udisks-2.1.4.tar.bz2

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

udisks-2.1.5.tar.bz2

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

udisks2.changes

@@ -1,3 +1,26 @@
+-------------------------------------------------------------------
+Fri Mar  6 16:00:45 UTC 2015 - sor.alexei@meowr.ru
+
+- Update to 2.1.5:
+  * configure: stop using tmpl files for docs.
+  * docs: include the annotation glossary.
+  * Drop default [df]mask for VFAT and NTFS.
+  * Drop unused goto label.
+  * Fix crash in udisks_client_finalize().
+  * Fix format string signedness warnings.
+  * integration-tests: Don't assume ordering in mount-points
+    property.
+  * integration-test: Skip double mount check for NTFS.
+  * integration-test: Stop requiring the build dependencies.
+  * integration-test: Test fstab parsing.
+  * Make UdisksClient.get_size_for_display() units translatable.
+  * Provide fallback for systems without ACL support.
+  * Recognize PARTUUID and PARTLABEL in fstab.
+  * Support mounting in /media for FHS compatibility.
+  * Update translations.
+- Add recommended /usr/sbin/rcudisks2 service alias.
+- Remove obsolete definitions.
+
 -------------------------------------------------------------------
 Fri Dec 19 12:35:16 UTC 2014 - zaitor@opensuse.org
 

udisks2.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package udisks2
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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
@@ -16,26 +16,24 @@
 #
 
 
-%{!?_udevrulesdir: %global _udevrulesdir %(pkg-config --variable=udevdir udev)/rules.d}
-
-Name:           udisks2
 %define _name   udisks
-Version:        2.1.4
+Name:           udisks2
+Version:        2.1.5
 Release:        0
 Summary:        Disk Management Service, version 2
 License:        GPL-2.0+
 Group:          System Environment/Daemons
-Url:            http://www.freedesktop.org/wiki/Software/udisks
+Url:            http://freedesktop.org/wiki/Software/udisks
 Source:         http://udisks.freedesktop.org/releases/%{_name}-%{version}.tar.bz2
-# Needed to build the man pages
+# Needed to build the man pages.
 BuildRequires:  docbook-xsl-stylesheets
-BuildRequires:  gobject-introspection-devel
 BuildRequires:  intltool
 BuildRequires:  libacl-devel
-# For xsltproc
+# For xsltproc.
 BuildRequires:  xsltproc
 BuildRequires:  pkgconfig(gio-unix-2.0) >= 2.36
 BuildRequires:  pkgconfig(glib-2.0) >= 2.36
+BuildRequires:  pkgconfig(gobject-introspection-1.0)
 BuildRequires:  pkgconfig(gudev-1.0) >= 165
 BuildRequires:  pkgconfig(libatasmart) >= 0.17
 BuildRequires:  pkgconfig(libsystemd-login) >= 44
@@ -45,11 +43,8 @@ BuildRequires:  pkgconfig(systemd)
 BuildRequires:  pkgconfig(udev)
 # sgdisk is called by udisksd to modify the partition tables... thus a needed tool.
 Requires:       gptfdisk
-Recommends:     %{name}-lang
+Recommends:     %{name}-lang = %{version}
-
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %{?systemd_requires}
-
 # Upstream First - Policy:
 # Never add any patches to this package without the upstream commit id
 # in the patch. Any patches added here without a very good reason to make
@@ -92,6 +87,7 @@ udisks provides a daemon, D-Bus API and command line tools
 for managing disks and storage devices.
 
 %lang_package
+
 %prep
 %setup -q -n %{_name}-%{version}
 
@@ -103,14 +99,15 @@ make %{?_smp_mflags}
 
 %install
 %make_install
-find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print
+find %{buildroot} -type f -name "*.la" -delete -print
+ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcudisks2
 %find_lang %{name}
 
 %pre
 %service_add_pre udisks2.service
 
 %post
-%{?udev_rules_update:%udev_rules_update}
+%{udev_rules_update}
 %service_add_post udisks2.service
 
 %preun
@@ -124,35 +121,35 @@ find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print
 %postun -n libudisks2-0 -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root,-)
+%defattr(-,root,root)
 %doc AUTHORS COPYING NEWS README
-%{_unitdir}/udisks2.service
+%{_sbindir}/rcudisks2
-%{_udevrulesdir}/80-udisks2.rules
 %{_sbindir}/umount.udisks2
 %{_bindir}/udisksctl
-%dir %{_libexecdir}/udisks2
+%{_libexecdir}/udisks2/
-%{_libexecdir}/udisks2/udisksd
+%{_unitdir}/udisks2.service
+%{_udevrulesdir}/80-udisks2.rules
 %{_datadir}/bash-completion/completions/udisksctl
-%{_sysconfdir}/dbus-1/system.d/org.freedesktop.UDisks2.conf
+%config %{_sysconfdir}/dbus-1/system.d/org.freedesktop.UDisks2.conf
 %{_datadir}/dbus-1/system-services/org.freedesktop.UDisks2.service
 %{_datadir}/polkit-1/actions/org.freedesktop.udisks2.policy
 %{_mandir}/man1/udisksctl.1%{?ext_man}
 %{_mandir}/man8/udisks.8%{?ext_man}
 %{_mandir}/man8/udisksd.8%{?ext_man}
 %{_mandir}/man8/umount.udisks2.8%{?ext_man}
-%attr(0770,root,root) %dir %{_localstatedir}/lib/udisks2
+%attr(0770,root,root) %dir %{_localstatedir}/lib/udisks2/
 
 %files -n libudisks2-0
-%defattr(-,root,root,-)
+%defattr(-,root,root)
 %doc AUTHORS COPYING NEWS README
 %{_libdir}/libudisks2.so.*
 
 %files -n typelib-1_0-UDisks-2_0
-%defattr(-,root,root,-)
+%defattr(-,root,root)
 %{_libdir}/girepository-1.0/UDisks-2.0.typelib
 
 %files devel
-%defattr(-,root,root,-)
+%defattr(-,root,root)
 %{_includedir}/udisks2/
 %{_libdir}/libudisks2.so
 %{_libdir}/pkgconfig/udisks2.pc
@@ -160,5 +157,6 @@ find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print
 %doc %{_datadir}/gtk-doc/html/udisks2/
 
 %files lang -f %{name}.lang
+%defattr(-,root,root)
 
 %changelog