- rel 12, fix patch fuzz

[packages/upower-pm-utils.git] / upower-pm-utils.spec

diff --git a/upower-pm-utils.spec b/upower-pm-utils.spec
index 3d374dab2027cad529bf71aeccb637d54b6d1b46..b218f9f0c583b1aae49f4668d80a5e82a501edde 100644 (file)
--- a/upower-pm-utils.spec
+++ b/upower-pm-utils.spec
@@ -5,13 +5,15 @@ Summary:      Power management service with pm-utils backend
 Summary(pl.UTF-8):     Usługa zarządzania energią z wykorzystaniem pm-utils
 Name:          %{orig_name}-pm-utils
 Version:       0.9.23
-Release:       7
+Release:       12
+Epoch:         1
 License:       GPL v2+
 Group:         Libraries
 Source0:       http://upower.freedesktop.org/releases/%{orig_name}-%{version}.tar.xz
 # Source0-md5: 39cfd97bfaf7d30908f20cf937a57634
 Patch0:                %{orig_name}-battery_range.patch
 Patch1:                %{orig_name}-glib-deprecated.patch
+Patch2:                %{orig_name}-libplist.patch
 URL:           http://upower.freedesktop.org/
 BuildRequires: autoconf >= 2.65
 BuildRequires: automake >= 1:1.11
@@ -24,7 +26,7 @@ BuildRequires:        gobject-introspection-devel >= 0.10.0
 BuildRequires: gtk-doc >= 1.11
 BuildRequires: intltool >= 0.40.0
 BuildRequires: libimobiledevice-devel >= 0.9.7
-BuildRequires: libplist-devel >= 0.12
+BuildRequires: libplist-devel >= 2.2.0
 BuildRequires: libtool >= 2:2
 BuildRequires: libusb-devel >= 1.0.0
 BuildRequires: pkgconfig
@@ -34,14 +36,14 @@ BuildRequires:      tar >= 1:1.22
 BuildRequires: udev-glib-devel >= 1:147
 BuildRequires: xz
 Requires(post,preun,postun):   systemd-units >= 38
-Requires:      %{name}-libs = %{version}-%{release}
+Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
 Requires:      libimobiledevice >= 0.9.7
-Requires:      libplist >= 0.12
+Requires:      libplist >= 2.2.0
 Requires:      pm-utils
 Requires:      polkit >= 0.97
 Requires:      systemd-units >= 38
 Requires:      udev-glib >= 1:147
-Provides:      %{orig_name} = %{version}-%{release}
+Provides:      %{orig_name} = %{epoch}:%{version}-%{release}
 Obsoletes:     %{orig_name}
 Obsoletes:     DeviceKit-power < 0.15
 Obsoletes:     UPower < 0.9.8-2
@@ -64,7 +66,7 @@ Group:                Libraries
 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 = %{epoch}:%{version}-%{release}
 
 %description libs
 UPower shared library.
@@ -76,11 +78,11 @@ Biblioteka współdzielona UPower.
 Summary:       Header files for UPower library
 Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki UPower
 Group:         Development/Libraries
-Requires:      %{name}-libs = %{version}-%{release}
+Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
 Requires:      dbus-devel >= 1.0.0
 Requires:      dbus-glib-devel >= 0.76
 Requires:      glib2-devel >= 1:2.22.0
-Provides:      %{orig_name}-devel = %{version}-%{release}
+Provides:      %{orig_name}-devel = %{epoch}:%{version}-%{release}
 Obsoletes:     %{orig_name}-devel
 Obsoletes:     DeviceKit-power-devel
 Obsoletes:     UPower-devel
@@ -95,8 +97,8 @@ Pliki nagłówkowe biblioteki UPower.
 Summary:       Static UPower library
 Summary(pl.UTF-8):     Statyczna biblioteka UPower
 Group:         Development/Libraries
-Requires:      %{orig_name}-devel = %{version}-%{release}
-Provides:      %{orig_name}-static = %{version}-%{release}
+Requires:      %{orig_name}-devel = %{epoch}:%{version}-%{release}
+Provides:      %{orig_name}-static = %{epoch}:%{version}-%{release}
 Obsoletes:     %{orig_name}-static
 
 %description static
@@ -113,9 +115,7 @@ Requires:   gtk-doc-common
 Obsoletes:     %{orig_name}-apidocs
 Obsoletes:     DeviceKit-power-apidocs
 Obsoletes:     UPower-apidocs
-%if "%{_rpmversion}" >= "5"
 BuildArch:     noarch
-%endif
 
 %description apidocs
 UPower API documentation.
@@ -127,6 +127,7 @@ Dokumentacja API UPower.
 %setup -q -n %{orig_name}-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__gtkdocize}
@@ -175,7 +176,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc AUTHORS HACKING NEWS README
 %attr(755,root,root) %{_bindir}/upower
-%attr(755,root,root) %{_libdir}/upowerd
+%attr(755,root,root) %{_libexecdir}/upowerd
 %config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.d/org.freedesktop.UPower.conf
 %dir %{_sysconfdir}/UPower
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/UPower/UPower.conf