Hello community,
here is the log from the commit of package xfce4-power-manager for
openSUSE:Factory checked in at 2014-04-30 15:12:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xfce4-power-manager (Old)
and /work/SRC/openSUSE:Factory/.xfce4-power-manager.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xfce4-power-manager"
Changes:
--------
--- /work/SRC/openSUSE:Factory/xfce4-power-manager/xfce4-power-manager.changes
2014-04-13 13:23:39.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.xfce4-power-manager.new/xfce4-power-manager.changes
2014-04-30 15:12:40.000000000 +0200
@@ -1,0 +2,18 @@
+Fri Apr 25 11:12:20 UTC 2014 - [email protected]
+
+- update to current git snapshot 1.2.0+git199 (revision gaf126a4)
+ - see http://git.xfce.org/xfce/xfce4-power-manager/log/ for a
+ list of changes
+- drop patches that have been included upstream:
+ xfce4-power-manager-automake-1.13.patch,
+ xfce4-power-manager-fix-battery-icon-typo.patch,
+ xfce4-power-manager-fix-brightness-type.patch,
+ xfce4-power-manager-fix-broken-translations.patch,
+ xfce4-power-manager-fix-help.patch,
+ xfce4-power-manager-systemd-inhibit.patch,
+ xfce4-power-manager-systemd-shutdown-reboot-support.patch,
+ xfce4-power-manager-systemd-suspend-hibernate-suport.patch,
+ xfce4-power-manager-upower-0.99.patch
+- remove support for openSUSE < 12.3
+
+-------------------------------------------------------------------
Old:
----
xfce4-power-manager-1.2.0.tar.bz2
xfce4-power-manager-automake-1.13.patch
xfce4-power-manager-fix-battery-icon-typo.patch
xfce4-power-manager-fix-brightness-type.patch
xfce4-power-manager-fix-broken-translations.patch
xfce4-power-manager-fix-help.patch
xfce4-power-manager-systemd-inhibit.patch
xfce4-power-manager-systemd-shutdown-reboot-support.patch
xfce4-power-manager-systemd-suspend-hibernate-suport.patch
xfce4-power-manager-upower-0.99.patch
New:
----
xfce4-power-manager-1.2.0+git199.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xfce4-power-manager.spec ++++++
--- /var/tmp/diff_new_pack.ey7yx2/_old 2014-04-30 15:12:42.000000000 +0200
+++ /var/tmp/diff_new_pack.ey7yx2/_new 2014-04-30 15:12:42.000000000 +0200
@@ -19,32 +19,15 @@
%define panel_version 4.10.0
Name: xfce4-power-manager
-Version: 1.2.0
+# git revision gaf126a4
+Version: 1.2.0+git199
Release: 0
Summary: Power Management for the Xfce Desktop Environment
License: GPL-2.0+
Group: System/GUI/XFCE
Url:
http://goodies.xfce.org/projects/applications/xfce4-power-manager
-Source0:
http://archive.xfce.org/src/apps/xfce4-power-manager/1.2/%{name}-%{version}.tar.bz2
+Source0: %{name}-%{version}.tar.bz2
Source1: xfce4-power-manager.xml
-# PATCH-FIX-UPSTREAM xfce4-power-manager-fix-help.patch bxo#8846
[email protected] -- Use xfce_dialog_show_help() and remove the bundled
documentation
-Patch0: xfce4-power-manager-fix-help.patch
-# PATCH-FIX-UPSTREAM xfce4-power-manager-fix-broken-translations.patch
bnc#788361 [email protected] -- Fix broken format strings in translations
causing crashes
-Patch1: xfce4-power-manager-fix-broken-translations.patch
-# PATCH-FEATURE-UPSTREAM xfce4-power-manager-systemd-inhibit.patch bnc#789057
[email protected] -- Add systemd inhibit support
-Patch2: xfce4-power-manager-systemd-inhibit.patch
-# PATCH-FIX-UPSTREAM xfce4-power-manager-automake-1.13.patch [email protected]
-- Add support for automake 1.13
-Patch3: xfce4-power-manager-automake-1.13.patch
-# PATCH-FIX-UPSTREAM xfce4-power-manager-fix-brightness-type.patch
[email protected] -- Use correct type for prightness property and fix the
screen auto-dimming issue and brightness panel plugin issue (backported from
upstream git)
-Patch4: xfce4-power-manager-fix-brightness-type.patch
-# PATCH-FIX-UPSTREAM xfce4-power-manager-systemd-shutdown-reboot-support.patch
bxo#10167 -- Add systemd shutdown/reboot support
-Patch5: xfce4-power-manager-systemd-shutdown-reboot-support.patch
-# PATCH-FIX-UPSTREAM
xfce4-power-manager-systemd-suspend-hibernate-suport.patch bxo#9963 -- Add
systemd suspend/hibernate support
-Patch6: xfce4-power-manager-systemd-suspend-hibernate-suport.patch
-# PATCH-FIX-UPSTREAM xfce4-power-manager-fix-battery-icon-typo.patch bxo#8188
bnc#846485 [email protected] -- Fix typo in battery icon name
-Patch7: xfce4-power-manager-fix-battery-icon-typo.patch
-# PATCH-FIX-OPENSUSE xfce4-power-manager-upower-0.99.patch bnc#873326
[email protected] -- preliminary patch for supporting upower 0.99.0
(this is not intended as a final fix. needs cleanup.)
-Patch42: xfce4-power-manager-upower-0.99.patch
BuildRequires: ed
BuildRequires: fdupes
BuildRequires: intltool
@@ -62,21 +45,15 @@
BuildRequires: pkgconfig(libxfce4ui-1)
BuildRequires: pkgconfig(libxfce4util-1.0)
BuildRequires: pkgconfig(libxfconf-0)
-%if 0%{?suse_version} >= 1230
BuildRequires: pkgconfig(polkit-gobject-1) >= 0.100
-%endif
BuildRequires: pkgconfig(upower-glib)
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xext)
BuildRequires: pkgconfig(xrandr)
Requires: polkit
+Requires: systemd
Requires: udisks
Requires: upower
-%if 0%{?suse_version} >= 1230
-Requires: systemd
-%else
-Requires: ConsoleKit-x11
-%endif
Recommends: %{name}-lang = %{version}
Provides: xfce4-power-manager-doc = %{version}
Obsoletes: xfce4-power-manager-doc <= 1.2.0
@@ -120,15 +97,6 @@
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch42 -p1
# show in LXDE as well
ed -s src/xfce4-power-manager.desktop.in 2>/dev/null <<'EOF'
,s/^OnlyShowIn=XFCE;/OnlyShowIn=XFCE;LXDE;/
@@ -137,7 +105,7 @@
%build
xdt-autogen
-%configure \
+%configure --enable-maintainer-mode \
%if 0%{?suse_version} < 1230
--with-sleep-manager=upower \
%endif
@@ -153,15 +121,14 @@
%suse_update_desktop_file xfce4-power-manager-settings
%suse_update_desktop_file xfce4-power-manager
+rm %{buildroot}%{_libdir}/xfce4/panel/plugins/libxfce4brightness.la
+
rm -rf %{buildroot}/%{_datadir}/locale/{ast,kk,tl_PH,ur_PK}
%find_lang %{name} %{?no_lang_C}
%fdupes %{buildroot}/%{_datadir}
-%clean
-rm -rf %{buildroot}
-
%post
%desktop_database_post
%icon_theme_cache_post
@@ -172,7 +139,8 @@
%files
%defattr(-,root,root)
-%doc AUTHORS COPYING ChangeLog NEWS README TODO
+%doc AUTHORS COPYING NEWS README TODO
+#%%doc ChangeLog
%{_bindir}/xfce4-power-manager
%{_bindir}/xfce4-power-manager-settings
%{_bindir}/xfce4-power-information
@@ -189,8 +157,8 @@
%files -n xfce4-panel-plugin-brightness
%defattr(-,root,root)
-%{_libdir}/xfce4/panel-plugins/xfce4-brightness-plugin
-%{_datadir}/xfce4/panel-plugins/*.desktop
+%{_libdir}/xfce4/panel/plugins/libxfce4brightness.so
+%{_datadir}/xfce4/panel-plugins/xfce4-brightness-plugin.desktop
%files branding-upstream
%defattr(-,root,root)
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
