Hello community, here is the log from the commit of package powertop for openSUSE:Factory checked in at 2012-05-16 15:03:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/powertop (Old) and /work/SRC/openSUSE:Factory/.powertop.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "powertop", Maintainer is "thoe...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/powertop/powertop.changes 2012-02-06 15:55:15.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.powertop.new/powertop.changes 2012-05-16 15:03:52.000000000 +0200 @@ -1,0 +2,15 @@ +Sat May 12 15:22:00 UTC 2012 - jeng...@inai.de + +- Update to new upstream release 2.0: +* Interactive mode: redesigned, tab-based user interface with full + on-demand window refresh support. +* Reporting mode: PowerTOP v2.0 now allows you to specify not only + the duration of each test measurement cycle, but the number of + iterations to measure. PowerTOP can now produce HTML and CSV. +* Increased WLAN support: PowerTOP now supports multiple + WLAN interfaces +* Enhanced i915 driver support +* More robust battery data acquisition +* Real time measurement support for USB hot-plug. + +------------------------------------------------------------------- Old: ---- powertop-1.98-compile-fix.patch powertop-1.98-unknown-readings-fix.patch powertop-1.98.tar.bz2 powertop_set_cflags_override.patch New: ---- powertop-2.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ powertop.spec ++++++ --- /var/tmp/diff_new_pack.isJnrq/_old 2012-05-16 15:03:53.000000000 +0200 +++ /var/tmp/diff_new_pack.isJnrq/_new 2012-05-16 15:03:53.000000000 +0200 @@ -16,29 +16,27 @@ # - Name: powertop -Url: http://www.lesswatts.org +Url: https://01.org/powertop/ +#Git-Clone: git://github.com/fenrus75/powertop Summary: A Linux Tool to Find out What is Using Power on a Laptop -Version: 1.98 -Release: 1 License: GPL-2.0+ Group: System/Monitoring -Source0: %{name}-%{version}.tar.bz2 -Patch1: powertop_set_cflags_override.patch +Version: 2.0 +Release: 0 +Source: https://01.org/powertop/sites/default/files/downloads/%name-%version.tar.bz2 Patch2: powertop-1.98-always-create-params.patch -Patch3: powertop-1.98-unknown-readings-fix.patch -Patch4: powertop-1.98-compile-fix.patch Patch5: powertop-no-date.patch BuildRequires: gcc-c++ +BuildRequires: gettext BuildRequires: ncurses-devel BuildRequires: pkg-config -BuildRequires: libnl-1_1-devel -BuildRequires: zlib-devel -BuildRequires: pciutils-devel -BuildRequires: gettext +BuildRequires: pkgconfig +BuildRequires: pkgconfig(libnl-3.0) +BuildRequires: pkgconfig(libnl-genl-3.0) +BuildRequires: pkgconfig(libpci) +BuildRequires: pkgconfig(zlib) BuildRoot: %{_tmppath}/%{name}-%{version}-build -AutoReqProv: on %description PowerTOP is a program that collects the various pieces of information @@ -47,37 +45,29 @@ %prep %setup -q -%patch1 -p1 %patch2 -p1 -%patch3 -p1 -%patch4 -p1 %patch5 -p1 %build -make CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" +%configure +make %{?_smp_mflags} %install -mkdir -p %{buildroot}/%{_bindir} -make install DESTDIR=%{buildroot} +make install DESTDIR="%buildroot" install -Dd %{buildroot}%{_localstatedir}/cache/powertop touch %{buildroot}%{_localstatedir}/cache/powertop/{saved_parameters.powertop,saved_results.powertop} -#%find_lang %{name} +%find_lang %{name} %post # Hack for powertop not to show warnings on first start touch %{_localstatedir}/cache/powertop/{saved_parameters.powertop,saved_results.powertop} -%clean -rm -rf %{_buildroot} - -#%files -f %{name}.lang - -%files +%files -f %name.lang %defattr(-,root,root) %doc COPYING README %dir %{_localstatedir}/cache/powertop %ghost %{_localstatedir}/cache/powertop/saved_parameters.powertop %ghost %{_localstatedir}/cache/powertop/saved_results.powertop -%{_bindir}/%{name} +%_sbindir/%name %changelog ++++++ powertop-1.98-always-create-params.patch ++++++ --- /var/tmp/diff_new_pack.isJnrq/_old 2012-05-16 15:03:53.000000000 +0200 +++ /var/tmp/diff_new_pack.isJnrq/_new 2012-05-16 15:03:53.000000000 +0200 @@ -1,26 +1,31 @@ -diff -up powertop-1.98/parameters/persistent.cpp.orig powertop-1.98/parameters/persistent.cpp ---- powertop-1.98/parameters/persistent.cpp.orig 2011-05-11 06:48:37.000000000 +0200 -+++ powertop-1.98/parameters/persistent.cpp 2011-12-02 19:48:45.056747667 +0100 -@@ -122,22 +122,23 @@ void save_parameters(const char *filenam +--- + src/parameters/persistent.cpp | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +Index: powertop-2.0/src/parameters/persistent.cpp +=================================================================== +--- powertop-2.0.orig/src/parameters/persistent.cpp ++++ powertop-2.0/src/parameters/persistent.cpp +@@ -129,9 +129,6 @@ void save_parameters(const char *filenam // printf("result size is %i, #parameters is %i \n", (int)past_results.size(), (int)all_parameters.parameters.size()); - if (!global_power_valid()) - return; +- + pathname = get_param_directory(filename); - file.open(filename, ios::out); - if (!file) { - cout << _("Cannot save to file ") << filename << "\n"; + file.open(pathname, ios::out); +@@ -140,12 +137,15 @@ void save_parameters(const char *filenam return; } -- -- map<string, int>::iterator it; +- map<string, int>::iterator it; +- - for (it = param_index.begin(); it != param_index.end(); it++) { - int index; - index = it->second; - file << it->first << "\t" << setprecision(9) << all_parameters.parameters[index] << "\n"; -- } + if (global_power_valid()) + { + map<string, int>::iterator it; @@ -29,8 +34,7 @@ + int index; + index = it->second; + file << it->first << "\t" << setprecision(9) << all_parameters.parameters[index] << "\n"; -+ } -+ } ++ } + } file.close(); } - ++++++ powertop-1.98.tar.bz2 -> powertop-2.0.tar.bz2 ++++++ ++++ 110587 lines of diff (skipped) ++++++ powertop-no-date.patch ++++++ --- /var/tmp/diff_new_pack.isJnrq/_old 2012-05-16 15:03:53.000000000 +0200 +++ /var/tmp/diff_new_pack.isJnrq/_new 2012-05-16 15:03:53.000000000 +0200 @@ -1,8 +1,12 @@ -Index: powertop-1.98/main.cpp +--- + src/main.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: powertop-2.0/src/main.cpp =================================================================== ---- powertop-1.98.orig/main.cpp -+++ powertop-1.98/main.cpp -@@ -71,7 +71,7 @@ static const struct option long_options[ +--- powertop-2.0.orig/src/main.cpp ++++ powertop-2.0/src/main.cpp +@@ -80,7 +80,7 @@ static const struct option long_options[ static void print_version() { @@ -10,4 +14,4 @@ + printf(_("Powertop version" POWERTOP_VERSION "\n")); } - static void print_usage() + static bool set_refresh_timeout() -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
