[meego-commits] 5998: Changes to Trunk:Testing/sofia-sip

Huaxu Wan huaxu.wan at intel.com
Tue Jul 27 07:30:33 UTC 2010


Hi,
I have made the following changes to sofia-sip in project Trunk:Testing. Please review and accept ASAP.

Thank You,
Huaxu Wan

[This message was auto-generated]

---

Request #5998:

  submit:   home:huaxu:branches:Trunk:Testing/sofia-sip(r2)(cleanup) -> Trunk:Testing/sofia-sip


Message:
    depended by telepathy-sofiasip

State:   new          2010-07-26T19:23:48 huaxu
Comment: None



changes files:
--------------
--- sofia-sip.changes
+++ sofia-sip.changes
@@ -1,2 +1,5 @@
-* Mon Jul 19 2010 Bernd Wachter <ext-bernd.wachter at nokia.com> - 1.12.10~gita1212e7
-- Update to latest git version
+* Mon Jul 26 2010 Huaxu Wan <huaxu.wan at intel.com> - 1.12.10
+- Disable make check
+
+* Mon Jul 26 2010 Huaxu Wan <huaxu.wan at intel.com> - 1.12.10
+- Init package
@@ -4,2 +6,0 @@
-* Mon Jul 19 2010 Bernd Wachter <ext-bernd.wachter at nokia.com> - 1.12.10
-- Initial RPM version

old:
----
  0001-Disable-generation-of-search-results-for-doxygen.patch
  revert-ca02a4d-openssl-ld-changes.patch
  sofia-sip-1.12.10~gita1212e7.tar.gz

new:
----
  sofia-sip-1.12.10.tar.gz
  sofia-sip.yaml

spec files:
-----------
--- sofia-sip.spec
+++ sofia-sip.spec
@@ -1,101 +1,174 @@
+# 
+# Do not Edit! Generated by:
+# spectacle version 0.18
+# 
+# >> macros
+# << macros
+
 Name: sofia-sip
-Version: 1.12.10~gita1212e7
+Summary:    Sofia SIP User-Agent library
+Version:    1.12.10
 Release: 1
-Summary: Open source SIP library
 Group: System/Libraries
-License: LGPLv2.1
+License:    LGPLv2+
 URL: http://sofia-sip.sourceforge.net/
-Source0: %{name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: pkgconfig(glib-2.0)
-BuildRequires: pkgconfig(libssl)
-BuildRequires: doxygen
+Source0:    http://dl.sourceforge.net/sofia-sip/%{name}-%{version}.tar.gz
+Source100:  sofia-sip.yaml
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+BuildRequires:  pkgconfig(openssl) >= 0.9.7
+BuildRequires:  pkgconfig(glib-2.0) >=  2.4
+BuildRequires:  lksctp-tools-devel
+BuildRequires:  libtool
+BuildRequires:  autoconf
 BuildRequires: automake
-Patch0: 0001-Disable-generation-of-search-results-for-doxygen.patch
-Patch1: revert-ca02a4d-openssl-ld-changes.patch
-
-%description
-Sofia-SIP is an open-source SIP User-Agent library, compliant
-with the IETF RFC3261 specification. It can be used as
-a building block for SIP client software for uses such as VoIP,
-IM, and many other real-time and person-to-person communication
-services.
-
 
-%files
-%defattr(-,root,root,-)
-%{_bindir}/*
-%{_libdir}/libsofia-sip-ua.so.*
-%{_mandir}/man1/*
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
-%package devel
-Summary: Development files for %{name}
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description devel
-%{summary}.
+%description
+Sofia SIP is a RFC-3261-compliant library for SIP user agents and
+other network elements.  The Session Initiation Protocol (SIP) is an
+application-layer control (signaling) protocol for creating,
+modifying, and terminating sessions with one or more
+participants. These sessions include Internet telephone calls,
+multimedia distribution, and multimedia conferences.
 
-%files devel
-%defattr(-,root,root,-)
-%{_libdir}/libsofia-sip-ua.so
-%exclude %{_libdir}/*.la
-%{_libdir}/pkgconfig/sofia-sip-ua.pc
-%{_datadir}/sofia-sip/*.awk
-%exclude %{_includedir}/%{name}-1.12/%{name}/su_source.h
-%exclude %{_includedir}/%{name}-1.12/%{name}/su_glib.h
-%{_includedir}/%{name}-1.12/*
 
 
 %package glib
-Summary: Glib bindings for %{name}
+Summary:    Glib bindings for Sofia-SIP
 Group: System/Libraries
+Requires:   %{name} = %{version}-%{release}
+Requires:   sofia-sip = %{version}-%{release}
 
 %description glib
-%{summary}.
+GLib interface to Sofia SIP User Agent library.
 
-%files glib
-%defattr(-,root,root,-)
-%{_libdir}/libsofia-sip-ua-glib.so.*
-
-%post glib -p /sbin/ldconfig
-%postun glib -p /sbin/ldconfig
+%package utils
+Summary:    Sofia-SIP Command Line Utilities
+Group:      Applications/Internet
+Requires:   %{name} = %{version}-%{release}
+Requires:   sofia-sip = %{version}-%{release}
 
+%description utils
+Command line utilities for the Sofia SIP UA library.
 
 %package glib-devel
-Summary: Development files for %{name}-glib
+Summary:    Glib bindings for Sofia SIP development files
 Group: Development/Libraries
-Requires: %{name}-glib = %{version}-%{release}
+Requires:   %{name} = %{version}-%{release}
+Requires:   sofia-sip-glib = %{version}-%{release}
+Requires:   sofia-sip-devel = %{version}-%{release}
+Requires:   pkgconfig
 
 %description glib-devel
-%{summary}.
+Development package for Sofia SIP UA Glib library. This package
+includes libraries and include files for developing glib programs
+using Sofia SIP.
 
-%files glib-devel
-%defattr(-,root,root,-)
-%{_libdir}/libsofia-sip-ua-glib.so
-%{_libdir}/pkgconfig/sofia-sip-ua-glib.pc
-%{_includedir}/%{name}-1.12/%{name}/su_source.h
-%{_includedir}/%{name}-1.12/%{name}/su_glib.h
+
+%package devel
+Summary:    Sofia-SIP Development Package
+Group:      Development/Libraries
+Requires:   %{name} = %{version}-%{release}
+Requires:   sofia-sip = %{version}-%{release}
+Requires:   pkgconfig
+
+%description devel
+Development package for Sofia SIP UA library.
 
 
 %prep
-%setup -q
-%patch0 -p1
-%patch1 -p1 -R
-autoreconf -vfi
+%setup -q -n %{name}-%{version}
+
+# >> setup
+# << setup
 
 %build
-%configure --enable-static=no
-make %{?_smp_mflags}
+# >> build pre
+# << build pre
+
+%configure --disable-static \
+    --disable-rpath \
+    --enable-sctp
 
+make %{?jobs:-j%jobs}
 
+# >> build post
+# << build post
 %install
 rm -rf %{buildroot}
-make DESTDIR=%{buildroot} install
+# >> install pre
+# << install pre
+%make_install 
+
+# >> install post
+find %{buildroot} -name \*.h.in |xargs rm
+# << install post
+%check
+# >> check
+#make check
+# << check
+
+%post
+# >> post
+/sbin/ldconfig
+# << post
+
+%postun
+# >> postun
+/sbin/ldconfig
+# << postun
+
+%post glib
+# >> post
+/sbin/ldconfig
+# << post
+
+%postun glib
+# >> postun
+/sbin/ldconfig
+# << postun
 
+%files
+%defattr(-,root,root,-)
+# >> files
+%doc AUTHORS ChangeLog ChangeLog.ext-trees COPYING COPYRIGHTS README README.developers RELEASE TODO
+%{_libdir}/libsofia-sip-ua.so.*
+# << files
+
+
+%files glib
+%defattr(-,root,root,-)
+# >> files glib
+%{_libdir}/libsofia-sip-ua-glib.so.*
+# << files glib
+
+%files utils
+%defattr(-,root,root,-)
+# >> files utils
+%{_bindir}/*
+%{_mandir}/man1/*.1*
+# << files utils
+
+%files glib-devel
+%defattr(-,root,root,-)
+# >> files glib-devel
+%{_includedir}/sofia-sip-1.12/sofia-sip/su_source.h
+%{_libdir}/libsofia-sip-ua-glib.so
+%{_libdir}/pkgconfig/sofia-sip-ua-glib.pc
+# << files glib-devel
+
+%files devel
+%defattr(-,root,root,-)
+# >> files devel
+%dir %{_includedir}/sofia-sip-1.12
+%dir %{_includedir}/sofia-sip-1.12/sofia-sip
+%{_includedir}/sofia-sip-1.12/sofia-sip/*.h
+%exclude %{_includedir}/sofia-sip-1.12/sofia-sip/su_source.h
+%dir %{_includedir}/sofia-sip-1.12/sofia-resolv
+%{_includedir}/sofia-sip-1.12/sofia-resolv/*.h
+%{_libdir}/libsofia-sip-ua.so
+%{_libdir}/pkgconfig/sofia-sip-ua.pc
+%{_datadir}/sofia-sip
+# << files devel
 
-%clean
-rm -rf %{buildroot}

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

++++++ sofia-sip-1.12.10~gita1212e7.tar.gz -> sofia-sip-1.12.10.tar.gz
196622 lines of diff (skipped)

++++++ sofia-sip.yaml (new)
--- sofia-sip.yaml
+++ sofia-sip.yaml
+Name: sofia-sip
+Summary: Sofia SIP User-Agent library
+Version: 1.12.10
+Release: 1
+Group: System/Libraries
+License: LGPLv2+
+URL: http://sofia-sip.sourceforge.net/
+Sources:
+    - http://dl.sourceforge.net/sofia-sip/%{name}-%{version}.tar.gz
+Description: |
+    Sofia SIP is a RFC-3261-compliant library for SIP user agents and
+    other network elements.  The Session Initiation Protocol (SIP) is an
+    application-layer control (signaling) protocol for creating,
+    modifying, and terminating sessions with one or more
+    participants. These sessions include Internet telephone calls,
+    multimedia distribution, and multimedia conferences.
+
+PkgBR:
+    - pkgconfig(openssl) >= 0.9.7
+    - pkgconfig(glib-2.0) >=  2.4
+    - lksctp-tools-devel
+    - libtool
+    - autoconf
+    - automake
+Configure: configure
+ConfigOptions:
+    - --disable-rpath
+    - --enable-sctp
+Builder: make
+Check: yes
+
+RequiresPost:
+    - /sbin/ldconfig
+RequiresPostUn:
+    - /sbin/ldconfig
+
+SubPackages:
+    - Name: glib
+      Summary: Glib bindings for Sofia-SIP
+      Group: System/Libraries
+      Description: GLib interface to Sofia SIP User Agent library.
+      Requires:
+          - sofia-sip = %{version}-%{release}
+
+    - Name: utils
+      Summary: Sofia-SIP Command Line Utilities
+      Group: Applications/Internet
+      Description: Command line utilities for the Sofia SIP UA library.
+      Requires:
+          - sofia-sip = %{version}-%{release}
+
+    - Name: glib-devel
+      Summary: Glib bindings for Sofia SIP development files
+      Group: Development/Libraries
+      Description: |
+          Development package for Sofia SIP UA Glib library. This package
+          includes libraries and include files for developing glib programs
+          using Sofia SIP.
+      Requires:
+          - sofia-sip-glib = %{version}-%{release}
+          - sofia-sip-devel = %{version}-%{release}
+          - pkgconfig
+
+    - Name: devel
+      Summary: Sofia-SIP Development Package
+      Group: Development/Libraries
+      Description: Development package for Sofia SIP UA library.
+      Requires:
+          - sofia-sip = %{version}-%{release}
+          - pkgconfig
+

++++++ deleted files:
--- 0001-Disable-generation-of-search-results-for-doxygen.patch
--- revert-ca02a4d-openssl-ld-changes.patch



More information about the MeeGo-commits mailing list