Author: megabajt Date: Wed Feb 16 20:46:37 2011 GMT Module: packages Tag: HEAD ---- Log message: - merged from DEVEL
---- Files affected: packages/xfce4-power-manager: xfce4-power-manager.spec (1.5 -> 1.6) , xfce4-power-manager-ac-am.patch (1.2 -> 1.3) ---- Diffs: ================================================================ Index: packages/xfce4-power-manager/xfce4-power-manager.spec diff -u packages/xfce4-power-manager/xfce4-power-manager.spec:1.5 packages/xfce4-power-manager/xfce4-power-manager.spec:1.6 --- packages/xfce4-power-manager/xfce4-power-manager.spec:1.5 Fri Feb 4 19:24:09 2011 +++ packages/xfce4-power-manager/xfce4-power-manager.spec Wed Feb 16 21:46:32 2011 @@ -2,30 +2,32 @@ Summary: Power manager for the Xfce desktop environment Summary(pl.UTF-8): Zarządca energii dla środowiska Xfce Name: xfce4-power-manager -Version: 0.8.5 -Release: 3 +Version: 1.0.3 +Release: 1 License: GPL v2 Group: X11/Applications -Source0: http://archive.xfce.org/src/apps/xfce4-power-manager/0.8/%{name}-%{version}.tar.bz2 -# Source0-md5: ca6a1fff1d4fee86844c2f5621e9fb87 -Patch0: %{name}-link.patch +Source0: http://archive.xfce.org/src/apps/xfce4-power-manager/1.0/%{name}-%{version}.tar.bz2 +# Source0-md5: 5dac3686a2419e367721f34b21c528a1 +Patch0: %{name}-ac-am.patch URL: http://goodies.xfce.org/projects/applications/xfce4-power-manager BuildRequires: autoconf >= 2.50 BuildRequires: automake >= 1:1.8 BuildRequires: dbus-glib-devel >= 0.74 BuildRequires: gettext-devel -BuildRequires: glib2-devel >= 1:2.14.0 -BuildRequires: gtk+2-devel >= 2:2.10.6 -BuildRequires: hal-devel >= 0.5.6 +BuildRequires: glib2-devel >= 1:2.16.0 +BuildRequires: gtk+2-devel >= 2:2.12.0 BuildRequires: intltool -BuildRequires: libnotify-devel +BuildRequires: libnotify-devel >= 0.4.1 BuildRequires: libtool -BuildRequires: libxfcegui4-devel >= 4.6.0 -BuildRequires: rpmbuild(macros) >= 1.311 -BuildRequires: xfce4-dev-tools >= 4.6.0 -BuildRequires: xfconf-devel >= 4.6.0 -Requires(post,postun): gtk-update-icon-cache -Requires(post,postun): hicolor-icon-theme +BuildRequires: libxfce4ui-devel >= 4.8.0 +BuildRequires: pkgconfig +BuildRequires: rpmbuild(macros) >= 1.601 +BuildRequires: upower-devel +BuildRequires: xfce4-dev-tools >= 4.7.0 +BuildRequires: xfce4-panel-devel >= 4.8.0 +BuildRequires: xfconf-devel >= 4.8.0 +Requires: gtk-update-icon-cache +Requires: upower Requires: xfce4-dirs >= 4.6 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -46,7 +48,8 @@ %{__autoconf} %{__autoheader} %{__automake} -%configure +%configure \ + --disable-silent-rules %{__make} @@ -56,7 +59,7 @@ %{__make} install \ DESTDIR=$RPM_BUILD_ROOT -rm -r $RPM_BUILD_ROOT%{_datadir}/locale/ur_PK +%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/ur_PK %find_lang %{name} @@ -73,12 +76,15 @@ %defattr(644,root,root,755) %doc AUTHORS ChangeLog NEWS README TODO %{_sysconfdir}/xdg/autostart/xfce4-power-manager.desktop +%attr(755,root,root) %{_bindir}/xfce4-power-information %attr(755,root,root) %{_bindir}/xfce4-power-manager %attr(755,root,root) %{_bindir}/xfce4-power-manager-settings +%attr(755,root,root) %{_sbindir}/xfpm-power-backlight-helper %attr(755,root,root) %{_libdir}/xfce4/panel-plugins/xfce4-brightness-plugin %{_desktopdir}/xfce4-power-manager-settings.desktop %{_datadir}/xfce4/panel-plugins/xfce4-brightness-plugin.desktop %{_iconsdir}/hicolor/*/*/* +%{_datadir}/polkit-1/actions/org.xfce.power.policy %{_datadir}/xfce4/doc/C/*.html %{_datadir}/xfce4/doc/C/images/*.png %{_mandir}/man1/xfce4-power-manager*.1* @@ -89,9 +95,25 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.6 2011/02/16 20:46:32 megabajt +- merged from DEVEL + +Revision 1.4.2.4 2011/02/11 19:50:13 megabajt +- updated to 1.0.3 + Revision 1.5 2011/02/04 18:24:09 wiget - Requires(post,postun): gtk-update-icon-cache +Revision 1.4.2.3 2010/11/15 21:54:19 baggins +- BR/R UPower(-devel) + +Revision 1.4.2.2 2010/11/15 11:58:27 baggins +- fix build +- updated files + +Revision 1.4.2.1 2010/11/15 09:52:52 baggins +- 1.0.1 for XFCE 4.8 + Revision 1.4 2010/11/13 19:28:45 baggins - rel 2 - no ur_PK @@ -105,4 +127,3 @@ Revision 1.1 2009/03/01 20:43:53 megabajt - new - ================================================================ Index: packages/xfce4-power-manager/xfce4-power-manager-ac-am.patch diff -u /dev/null packages/xfce4-power-manager/xfce4-power-manager-ac-am.patch:1.3 --- /dev/null Wed Feb 16 21:46:37 2011 +++ packages/xfce4-power-manager/xfce4-power-manager-ac-am.patch Wed Feb 16 21:46:32 2011 @@ -0,0 +1,29 @@ +diff -urN xfce4-power-manager-1.0.3/configure.ac xfce4-power-manager-1.0.3.new//configure.ac +--- xfce4-power-manager-1.0.3/configure.ac 2011-01-04 13:37:58.000000000 +0000 ++++ xfce4-power-manager-1.0.3.new//configure.ac 2011-02-11 19:45:25.683334784 +0000 +@@ -251,7 +251,7 @@ + ====================================== + + prefix: ${prefix} +- xdg autostart: ${sysconfdir/xdg/autostart} ++ xdg autostart: ${sysconfdir}/xdg/autostart + POLKIT: ${polkit} + DPMS: ${have_dpms} + Network manager: ${ac_network_manager} +diff -urN xfce4-power-manager-1.0.3/src/Makefile.am xfce4-power-manager-1.0.3.new//src/Makefile.am +--- xfce4-power-manager-1.0.3/src/Makefile.am 2011-01-04 12:22:56.000000000 +0000 ++++ xfce4-power-manager-1.0.3.new//src/Makefile.am 2011-02-11 19:45:51.306668083 +0000 +@@ -97,10 +97,11 @@ + $(PLATFORM_LDFLAGS) + + xfce4_power_information_LDADD = \ ++ $(top_builddir)/libdbus/libxfpmdbus.la \ + $(GOBJECT_LIBS) \ + $(DBUS_GLIB_LIBS) \ +- $(LIBXFCE4UI_LIBS) \ +- $(top_builddir)/libdbus/libxfpmdbus.la ++ $(LIBXFCE4UI_LIBS) ++ + + if ENABLE_POLKIT + ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xfce4-power-manager/xfce4-power-manager.spec?r1=1.5&r2=1.6&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xfce4-power-manager/xfce4-power-manager-ac-am.patch?r1=1.2&r2=1.3&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
