[meego-commits] 5471: Changes to Trunk/gupnp-igd

[Anas Nashif]

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

Thank You,
Anas Nashif

[This message was auto-generated]

---

Request #5471:

  submit:   Trunk:Testing/gupnp-igd(r4) -> Trunk/gupnp-igd


Message:
    * Thu Jul 08 2010 Bin Gao <bin.gao at intel.com> 0.1.7
- Update to 0.1.7
- Update to 0.1.5

State:   new          2010-07-08T15:41:44 nashif
Comment: None



changes files:
--------------
--- gupnp-igd.changes
+++ gupnp-igd.changes
@@ -0,0 +1,3 @@
+* Thu Jul 08 2010 Bin Gao <bin.gao at intel.com> 0.1.7
+- Update to 0.1.7
+
@@ -5 +8 @@
-* Update to 0.1.5
+- Update to 0.1.5

old:
----
  gupnp-igd-0.1.5.tar.gz

new:
----
  gupnp-igd-0.1.7.tar.gz

spec files:
-----------
--- gupnp-igd.spec
+++ gupnp-igd.spec
@@ -1,13 +1,14 @@
 # 
 # Do not Edit! Generated by:
-# spectacle version 0.13~pre
+# spectacle version 0.17
 # 
 # >> macros
+%define python_libdir %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
 # << macros
 
 Name:       gupnp-igd
 Summary:    GUPNP-igd is is a library to handle UPnP IGD port mapping
-Version:    0.1.5
+Version:    0.1.7
 Release:    2
 Group:      System/Libraries
 License:    GPLv2+
@@ -16,17 +17,27 @@
 Source100:  gupnp-igd.yaml
 Requires(post):  /sbin/ldconfig
 Requires(postun):  /sbin/ldconfig
-BuildRequires:  pkgconfig(gtk-doc)
 BuildRequires:  pkgconfig(gssdp-1.0)
 BuildRequires:  pkgconfig(gupnp-1.0)
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(libsoup-2.4)
+BuildRequires:  pkgconfig(pygtk-2.0)
+BuildRequires:  python-devel
 
-BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
 %description
-Description: %{summary}
+This is a library to handle UPnP IGD port mapping.
+
+
+
+%package python
+Summary:    Python bindings for %{name}
+Group:      Development/Libraries
+Requires:   %{name} = %{version}-%{release}
+
+%description python
+The %{name}-python package contains the Python bindings for %{name}.
 
 
 %package devel
@@ -35,19 +46,13 @@
 Requires:   %{name} = %{version}-%{release}
 
 %description devel
-Description: %{summary}
-
-%package doc
-Summary:    Documentation for gupnp-igd
-Group:      Documentation
-Requires:   %{name} = %{version}-%{release}
+Files for development with gupnp-igd.
 
-%description doc
-Description: %{summary}
 
 
 %prep
 %setup -q -n %{name}-%{version}
+
 # >> setup
 # << setup
 
@@ -56,9 +61,8 @@
 # << build pre
 
 %configure --disable-static \
-    --with-gtk-doc
+    --disable-gtk-doc
 
-# Call make instruction with smp support
 make %{?jobs:-j%jobs}
 
 # >> build post
@@ -70,40 +74,39 @@
 %make_install
 
 # >> install post
+# A workaround to manually remove gtk-doc stuff.
+# --disable-gtk-doc doesn't work here, sigh...
+rm -fr %{buildroot}/usr/share/gtk-doc/html/gupnp-igd
 # << install post
 
-%clean
-rm -rf %{buildroot}
-
 
 
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
-
-
-
 %files
 %defattr(-,root,root,-)
 # >> files
-%doc AUTHORS COPYING README
+%doc COPYING
 %{_libdir}/libgupnp-igd-1.0.so.*
 # << files
 
 
+%files python
+%defattr(-,root,root,-)
+# >> files python
+%dir %{python_libdir}/gupnp
+%{python_libdir}/gupnp/*.py*
+%{python_libdir}/gupnp/igd.so
+# << files python
+
 %files devel
 %defattr(-,root,root,-)
 # >> files devel
+%doc AUTHORS README ChangeLog NEWS
 %{_includedir}/gupnp-igd-1.0/*
 %{_libdir}/libgupnp-igd-1.0.so
 %{_libdir}/pkgconfig/gupnp-igd-1.0.pc
 # << files devel
 
-%files doc
-%defattr(-,root,root,-)
-# >> files doc
-%{_datadir}/gtk-doc
-%doc AUTHORS ChangeLog NEWS README
-# << files doc
-

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

++++++ gupnp-igd-0.1.5.tar.gz -> gupnp-igd-0.1.7.tar.gz
31645 lines of diff (skipped)

++++++ gupnp-igd.yaml
--- gupnp-igd.yaml
+++ gupnp-igd.yaml
@@ -1,29 +1,35 @@
 Name: gupnp-igd
 Summary: GUPNP-igd is is a library to handle UPnP IGD port mapping
-Version: 0.1.5
+Version: 0.1.7
 Release: 2
 Group: System/Libraries
 License: GPLv2+
 URL: http://www.gupnp.org
+Description: |
+    This is a library to handle UPnP IGD port mapping.
 Sources:
     - http://www.gupnp.org/sources/%{name}/%{name}-%{version}.tar.gz
-
+PkgBR:
+    - python-devel
 PkgConfigBR:
-    - gtk-doc
     - gssdp-1.0
     - gupnp-1.0
     - glib-2.0
     - libxml-2.0
     - libsoup-2.4
+    - pygtk-2.0
 Configure: configure
 ConfigOptions:
-    - --with-gtk-doc
+    - --disable-gtk-doc
 SubPackages:
+    - Name: python
+      Summary: Python bindings for %{name}
+      Group: Development/Libraries
+      Description: |
+        The %{name}-python package contains the Python bindings for %{name}.
+
     - Name: devel
       Summary: Development packages for gupnp-igd
       Group: Development/Libraries
-
-    - Name: doc
-      Summary: Documentation for gupnp-igd
-      Group: Documentation
-
+      Description: |
+        Files for development with gupnp-igd.