phatina pushed to storaged (master). "Rebase to the new Storaged implementation"

Thu Apr 2 13:50:01 UTC 2015

>From 10783ad3eba1055aaff85cfd67837df6d29e0ae7 Mon Sep 17 00:00:00 2001
From: Peter Hatina <phatina at redhat.com>
Date: Thu, 2 Apr 2015 15:49:28 +0200
Subject: Rebase to the new Storaged implementation

diff --git a/sources b/sources
index 2f4e309..fec753a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-496b2d49b9020d537f414c3a21daaed4  storaged-0.3.1.tar.bz2
+2f898a8ae163f45ba87b9476887a7003  storaged-2.0.0.tar.bz2
diff --git a/storaged.spec b/storaged.spec
index f27df0b..3b540c1 100644
--- a/storaged.spec
+++ b/storaged.spec
@@ -1,72 +1,185 @@
-Name:           storaged
-Version:        0.3.1
-Release:        1%{?dist}
-Summary:        Extended storage management DBus service
-
-# The daemon and tools are licensed under the GPLv2 (or later) and libraries are
-# licensed under LGPLv2 (or later).
-License:        GPLv2+ and LGPLv2+
-URL:            https://github.com/cockpit-project/storaged
-Source0:        https://github.com/cockpit-project/storaged/releases/download/%{version}/storaged-%{version}.tar.bz2
-
-BuildRequires:  libudisks2-devel
-BuildRequires:  libxslt
-BuildRequires:  gobject-introspection-devel
-BuildRequires:  libgudev1-devel
-BuildRequires:  lvm2-devel
-BuildRequires:  glib2-devel
-BuildRequires:  polkit-devel
-BuildRequires:  intltool
-BuildRequires:  systemd
-BuildRequires:  docbook-style-xsl
-
-Requires(post): systemd
-Requires(preun): systemd
-Requires(postun): systemd
-
+%global glib2_version                   2.36
+%global gobject_introspection_version   1.30.0
+%global polkit_version                  0.102
+%global systemd_version                 209
+%global libatasmart_version             0.17
+%global dbus_version                    1.4.0
+
+Name:    storaged
+Summary: Disk Manager
+Version: 2.0.0
+Release: 1%{?dist}
+License: GPLv2+
+Group:   System Environment/Libraries
+URL:     https://github.com/storaged-project/storaged
+Source0: https://github.com/storaged-project/storaged/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2
+
+BuildRequires: pkgconfig(gio-unix-2.0) >= %{glib2_version}
+BuildRequires: pkgconfig(gobject-introspection-1.0) >= %{gobject_introspection_version}
+BuildRequires: pkgconfig(gudev-1.0) >= %{systemd_version}
+BuildRequires: pkgconfig(libatasmart) >= %{libatasmart_version}
+BuildRequires: pkgconfig(libsystemd) >= %{systemd_version}
+BuildRequires: pkgconfig(polkit-gobject-1) >= %{polkit_version}
+BuildRequires: libacl-devel
+BuildRequires: chrpath
+BuildRequires: gtk-doc
+BuildRequires: intltool
+BuildRequires: lvm2-devel
+
+# Needed to pull in the system bus daemon
+Requires: dbus >= %{dbus_version}
+# Needed to pull in the udev daemon
+Requires: systemd >= %{systemd_version}
+# We need at least this version for bugfixes/features etc.
+Requires: libatasmart >= %{libatasmart_version}
+# For mount, umount, mkswap
+Requires: util-linux
+# For mkfs.ext3, mkfs.ext3, e2label
+Requires: e2fsprogs
+# For mkfs.xfs, xfs_admin
+Requires: xfsprogs
+# For mkfs.vfat
+Requires: dosfstools
+# For partitioning
+Requires: parted
+Requires: gdisk
+# For LUKS devices
+Requires: cryptsetup-luks
+# For ejecting removable disks
+Requires: eject
+# For MD-RAID
+Requires: mdadm
+# For LVM2
+Requires: lvm2
+
+Requires: libstoraged%{?_isa} = %{version}-%{release}
+
+# For mkntfs (not available on rhel or on ppc/ppc64)
+%if ! 0%{?rhel}
+%ifnarch ppc ppc64
+Requires: ntfsprogs
+%endif
+%endif
+
+# For /proc/self/mountinfo, only available in 2.6.26 or higher
+Conflicts: kernel < 2.6.26
 
 %description
-This is a DBus service that provides management of extended
-storage options, currently only LVM.
+The Storaged project provides a daemon, tools and libraries to access and
+manipulate disks, storage devices and technologies.
 
-This is an extension to udisks2.
+%package -n libstoraged
+Summary: Dynamic library to access the storaged daemon
+Group: System Environment/Libraries
+License: LGPLv2+
 
+%description -n libstoraged
+This package contains the dynamic library storaged, which provides
+access to the storaged daemon.
 
-%prep
-%setup -q
+%package -n storaged-lvm2
+Summary: Module for LVM2
+Group: System Environment/Libraries
+License: LGPLv2+
+
+%description -n storaged-lvm2
+This package contains module for LVM2 configuration.
 
+%package -n libstoraged-devel
+Summary: Development files for libstoraged
+Group: Development/Libraries
+Requires: libstoraged%{?_isa} = %{version}-%{release}
+License: LGPLv2+
+
+%description -n libstoraged-devel
+This package contains the development files for the library
+libstoraged, a dynamic library, which provides access to the storaged
+daemon.
+
+%prep
+%setup -q -n storaged-%{version}
 
 %build
-%configure
+%configure --enable-gtk-doc --enable-lvm2
+# 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 %{?_smp_mflags}
 
-
 %install
-%make_install
+make install DESTDIR=%{buildroot}
+
+find %{buildroot} -name \*.la -o -name \*.a | xargs rm
+
+chrpath --delete %{buildroot}/%{_sbindir}/umount.storaged
+chrpath --delete %{buildroot}/%{_bindir}/storagedctl
+chrpath --delete %{buildroot}/%{_prefix}/lib/storaged/storaged
 
+%find_lang %{name}
 
-%files
-%doc AUTHORS COPYING HACKING README
-%doc %{_mandir}/man8/storaged.8.gz
-%{_unitdir}/storaged.service
-%{_libdir}/%{name}
-%{_sysconfdir}/dbus-1/system.d/com.redhat.storaged.conf
-%{_datadir}/dbus-1/interfaces/com.redhat.lvm2.xml
-%{_datadir}/dbus-1/system-services/com.redhat.storaged.service
-%{_datadir}/polkit-1/actions/com.redhat.lvm2.policy
+%post -n libstoraged -p /sbin/ldconfig
 
+%postun -n libstoraged -p /sbin/ldconfig
 
-%post
-%systemd_post com.redhat.storaged.service
+%files -f %{name}.lang
+%doc README.md AUTHORS NEWS HACKING
+%license COPYING
 
-%preun
-%systemd_preun com.redhat.storaged.service
+%dir %{_sysconfdir}/storaged
 
-%postun
-%systemd_postun_with_restart com.redhat.storaged.service
+%{_sysconfdir}/dbus-1/system.d/org.storaged.Storaged.conf
+%{_datadir}/bash-completion/completions/storagedctl
+%{_prefix}/lib/systemd/system/storaged.service
+%{_prefix}/lib/udev/rules.d/80-storaged.rules
+%{_sbindir}/umount.storaged
 
+%dir %{_prefix}/lib/storaged
+%{_prefix}/lib/storaged/storaged
+
+%{_bindir}/storagedctl
+
+%{_mandir}/man1/storagedctl.1*
+%{_mandir}/man8/storaged.8*
+%{_mandir}/man8/storaged-project.8*
+%{_mandir}/man8/umount.storaged.8*
+
+%{_datadir}/polkit-1/actions/org.storaged.Storaged.policy
+%{_datadir}/dbus-1/system-services/org.storaged.Storaged.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/storaged
+
+%files -n libstoraged
+%{_libdir}/libstoraged.so.*
+%{_libdir}/girepository-1.0/Storaged-2.0.typelib
+
+%files -n storaged-lvm2
+%dir %{_prefix}/lib/storaged
+%dir %{_libdir}/storaged
+%dir %{_libdir}/storaged/lvm-nolocking
+%dir %{_libdir}/storaged/modules
+%{_prefix}/lib/storaged/storaged-lvm
+%{_libdir}/storaged/lvm-nolocking/lvm.conf
+%{_libdir}/storaged/modules/libstoraged_lvm2.so
+%{_datadir}/polkit-1/actions/org.storaged.Storaged.lvm2.policy
+%{_mandir}/man8/storaged-lvm.8*
+
+%files -n libstoraged-devel
+%{_libdir}/libstoraged.so
+%dir %{_includedir}/storaged
+%dir %{_includedir}/storaged/storaged
+%{_includedir}/storaged/storaged/*.h
+%{_datadir}/gir-1.0/Storaged-2.0.gir
+%dir %{_datadir}/gtk-doc/html/storaged
+%{_datadir}/gtk-doc/html/storaged/*
+%{_libdir}/pkgconfig/storaged.pc
 
 %changelog
+* Thu Apr 02 2015 Peter Hatina <phatina at redhat.com> - 2.0.0-1
+- Rebase to the new Storaged implementation
+- Upstream: https://storaged.org
+
 * Tue Sep 16 2014 Stef Walter <stefw at redhat.com> - 0.3.1-1
 - Update to upstream 0.3.1
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/storaged.git/commit/?h=master&id=10783ad3eba1055aaff85cfd67837df6d29e0ae7
