[packages/upower-pm-utils] - allow coexistence of upower-libs and upower-pm-utils-libs
adwol
adwol at pld-linux.org
Wed Nov 4 23:14:36 CET 2015
commit c79fb0ffcb729851cacd5edcb65a38fb3b9cf5bc
Author: Adam Osuchowski <adwol at pld-linux.org>
Date: Wed Nov 4 23:14:17 2015 +0100
- allow coexistence of upower-libs and upower-pm-utils-libs
upower-pm-utils.spec | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
---
diff --git a/upower-pm-utils.spec b/upower-pm-utils.spec
index 0cb42cb..5670776 100644
--- a/upower-pm-utils.spec
+++ b/upower-pm-utils.spec
@@ -38,6 +38,7 @@ Requires: pm-utils
Requires: polkit >= 0.97
Requires: systemd-units >= 38
Requires: udev-glib >= 1:147
+Requires: %{name}-libs = %{version}-%{release}
Provides: %{orig_name} = %{version}-%{release}
Obsoletes: DeviceKit-power < 0.15
Obsoletes: UPower < 0.9.8-2
@@ -62,14 +63,6 @@ Requires: dbus-glib >= 0.76
Requires: dbus-libs >= 1.0.0
Requires: glib2 >= 1:2.22.0
Provides: %{orig_name}-libs = %{version}-%{release}
-Provides: %{orig_name}-libs = 0.99.0
-%ifarch %{x8664}
-Provides: libupower-glib.so.3()(64bit)
-%else
-Provides: libupower-glib.so.3
-%endif
-Obsoletes: %{orig_name}-libs
-Conflicts: %{orig_name} < 0.9.18
%description libs
UPower shared library.
@@ -152,8 +145,6 @@ rm -rf $RPM_BUILD_ROOT
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-ln -s libupower-glib.so.1 $RPM_BUILD_ROOT/%{_libdir}/libupower-glib.so.3
-
%find_lang upower
%clean
@@ -202,7 +193,6 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libupower-glib.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libupower-glib.so.1
-%attr(755,root,root) %{_libdir}/libupower-glib.so.3
%{_libdir}/girepository-1.0/UPowerGlib-1.0.typelib
%files devel
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/upower-pm-utils.git/commitdiff/c79fb0ffcb729851cacd5edcb65a38fb3b9cf5bc
More information about the pld-cvs-commit
mailing list