[meego-commits] 7401: Changes to Trunk/upower

[Peter Zhu]

Hi,
I have made the following changes to upower in project Trunk. Please review and accept ASAP.

Thank You,
Peter Zhu

[This message was auto-generated]

---

Request #7401:

  submit:   Trunk:Testing/upower(r3) -> Trunk/upower


Message:
    Move to Trunk

State:   new          2010-09-08T04:14:48 peter
Comment: None



changes files:
--------------
--- upower.changes
+++ upower.changes
@@ -0,0 +1,4 @@
+* Sat Sep 04 2010 Anas Nashif <nashif at linux.intel.com> - 0.9.5
+- Do not require gobject-introspection
+- Use a proper release, not a git snapshot
+

old:
----
  UPOWER_0_9_4.tar.bz2

new:
----
  upower-0.9.5.tar.bz2

spec files:
-----------
--- upower.spec
+++ upower.spec
@@ -1,6 +1,6 @@
 # 
-# Do not Edit! Generated by:
-# spectacle version 0.18
+# Do NOT Edit the Auto-generated Part!
+# Generated by: spectacle version 0.18
 # 
 # >> macros
 %define ver 0_9_4
@@ -8,22 +8,22 @@
 
 Name:       upower
 Summary:    Power Management Service
-Version:    0.9.4
+Version:    0.9.5
 Release:    2
 Group:      System/Libraries
 License:    GPLv2+
-URL:        http://hal.freedesktop.org/releases/
-Source0:    http://cgit.freedesktop.org/DeviceKit/upower/snapshot/UPOWER_%{ver}.tar.bz2
+URL:        http://upower.freedesktop.org/
+Source0:    http://upower.freedesktop.org/releases/upower-%{version}.tar.bz2
 Source100:  upower.yaml
 Requires:   polkit >= 0.92
 Requires:   udev
 Requires:   pm-utils >= 1.2.2.1
-Requires:   gobject-introspection
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 BuildRequires:  pkgconfig(sqlite3)
 BuildRequires:  pkgconfig(gudev-1.0)
 BuildRequires:  pkgconfig(libusb)
+BuildRequires:  pkgconfig(libusb-1.0)
 BuildRequires:  pkgconfig(dbus-1)
 BuildRequires:  pkgconfig(dbus-glib-1)
 BuildRequires:  pkgconfig(glib-2.0)
@@ -55,14 +55,13 @@
 
 
 %prep
-%setup -q -n UPOWER_%{ver}
+%setup -q -n %{name}-%{version}
 
 # >> setup
 # << setup
 
 %build
 # >> build pre
-./autogen.sh
 # << build pre
 
 %configure --disable-static \

other changes:
--------------

++++++ upower-0.9.5.tar.bz2 (new)

++++++ upower.yaml
--- upower.yaml
+++ upower.yaml
@@ -1,12 +1,12 @@
 Name: upower
 Summary: Power Management Service
-Version: 0.9.4
+Version: 0.9.5
 Release: 2
 Group: System/Libraries
 License: GPLv2+
-URL: http://hal.freedesktop.org/releases/
+URL: http://upower.freedesktop.org/
 Sources:
-    - http://cgit.freedesktop.org/DeviceKit/upower/snapshot/UPOWER_%{version}.tar.bz2
+    - http://upower.freedesktop.org/releases/upower-%{version}.tar.bz2
 Description: |
     UPower (formerly DeviceKit-power) provides a daemon, API and command
     line tools for managing power devices attached to the system.
@@ -14,11 +14,11 @@
     - polkit >= 0.92
     - udev
     - pm-utils >= 1.2.2.1
-    - gobject-introspection
 PkgConfigBR:
     - sqlite3
     - gudev-1.0
     - libusb
+    - libusb-1.0
     - dbus-1
     - dbus-glib-1
     - glib-2.0
@@ -32,11 +32,9 @@
     - DeviceKit-power
 Obsoletes:
     - DeviceKit-power < 1:0.9.0-2
-Configure: configure
 ConfigOptions:
     - --enable-gtk-doc
     - --enable-introspection
-Builder: make
 LocaleName: upower
 SubPackages:
     - Name: devel

++++++ deleted files:
--- UPOWER_0_9_4.tar.bz2