commit 72e49eda4f3e084339d016d88994ce73c07fcc15
Author: Jakub Bogusz <[email protected]>
Date:   Sat Sep 8 19:48:46 2012 +0200

    - general cleanup, more verbose files
    - removed invalid skip_post_check_so
    - as addrinfo binary is removed, remove man page as well

 sofia-sip.spec | 53 ++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 34 insertions(+), 19 deletions(-)
---
diff --git a/sofia-sip.spec b/sofia-sip.spec
index 3342101..c514df9 100644
--- a/sofia-sip.spec
+++ b/sofia-sip.spec
@@ -3,14 +3,14 @@
 %bcond_with    doxygen # Generate documents using doxygen and dot
 %bcond_with    check   # Run tests
 %bcond_without openssl # No OpenSSL (TLS)
-%bcond_with    sigcomp # with Sofia SigComp
+%bcond_with    sigcomp # with Sofia SigComp [Nokia proprietary?]
 #
 Summary:       Sofia SIP User-Agent library
 Summary(pl.UTF-8):     Biblioteka agenta użytkownika Sofia SIP
 Name:          sofia-sip
 Version:       1.12.11
 Release:       1
-License:       LGPL 2.1
+License:       LGPL v2.1+
 Group:         Libraries
 Source0:       
http://downloads.sourceforge.net/sofia-sip/%{name}-%{version}.tar.gz
 # Source0-md5: f3582c62080eeecd3fa4cd5d4ccb4225
@@ -19,7 +19,7 @@ URL:          http://sf.net/projects/sofia-sip/
 BuildRequires: doxygen >= 1.3.4
 BuildRequires: graphviz >= 1.9
 %endif
-BuildRequires: glib2-devel
+BuildRequires: glib2-devel >= 2.0
 %{?with_openssl:BuildRequires: openssl-devel >= 0.9.7}
 BuildRequires: pkgconfig
 %if %{with sigcomp}
@@ -29,7 +29,6 @@ Requires:     sofia-sigcomp >= 2.5.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %undefine      __cxx
-%define                skip_post_check_so      libsofia-sip-ua-glib.so.3.0.0
 
 %description
 Sofia SIP is a RFC-3261-compliant library for SIP user agents and
@@ -44,6 +43,8 @@ Summary:      Sofia-SIP Development Package
 Summary(pl.UTF-8):     Pakiet programistyczny Sofia-SIP
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
+Requires:      glib2-devel >= 2.0
+%{?with_openssl:Requires:      openssl-devel >= 0.9.7}
 
 %description devel
 Development package for Sofia SIP UA library.
@@ -80,12 +81,13 @@ Działające z linii poleceń narzędzia do biblioteki Sofia 
SIP UA.
 
 %build
 %configure \
-       --with%{!?with_openssl:out}-openssl \
-       --with%{!?with_sigcomp:out}-sigcomp
+       --with-openssl%{!?with_openssl:=no} \
+       --with-sigcomp%{!?with_sigcomp:=no}
+
+%{__make} \
+       SOFIA_SILENT=
 
-%{__make}
 %{?with_check:%{__make} check}
-%{?with_doxygen:%{__make} check} # ???
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -93,7 +95,7 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-rm $RPM_BUILD_ROOT%{_bindir}/addrinfo
+%{__rm} $RPM_BUILD_ROOT{%{_bindir}/addrinfo,%{_mandir}/man1/addrinfo.1}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -103,25 +105,38 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS COPYRIGHTS README RELEASE ChangeLog
-%attr(755,root,root) %{_libdir}/libsofia-sip-ua*.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libsofia-sip-ua-glib.so.3
+%doc AUTHORS COPYRIGHTS ChangeLog ChangeLog.ext-trees README RELEASE
+%attr(755,root,root) %{_libdir}/libsofia-sip-ua.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libsofia-sip-ua.so.0
+%attr(755,root,root) %{_libdir}/libsofia-sip-ua-glib.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libsofia-sip-ua-glib.so.3
 %{_datadir}/sofia-sip
 
 %files devel
 %defattr(644,root,root,755)
 %doc TODO README.developers %{?with_doxygen:docs/*}
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.la
-%{_includedir}/*
-%{_pkgconfigdir}/*.pc
+%attr(755,root,root) %{_libdir}/libsofia-sip-ua.so
+%attr(755,root,root) %{_libdir}/libsofia-sip-ua-glib.so
+%{_libdir}/libsofia-sip-ua.la
+%{_libdir}/libsofia-sip-ua-glib.la
+%{_includedir}/sofia-sip-1.12
+%{_pkgconfigdir}/sofia-sip-ua.pc
+%{_pkgconfigdir}/sofia-sip-ua-glib.pc
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libsofia-sip-ua.a
+%{_libdir}/libsofia-sip-ua-glib.a
 
 %files utils
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/*
-%{_mandir}/man1/*.1*
+%attr(755,root,root) %{_bindir}/localinfo
+%attr(755,root,root) %{_bindir}/sip-date
+%attr(755,root,root) %{_bindir}/sip-dig
+%attr(755,root,root) %{_bindir}/sip-options
+%attr(755,root,root) %{_bindir}/stunc
+%{_mandir}/man1/localinfo.1*
+%{_mandir}/man1/sip-date.1*
+%{_mandir}/man1/sip-dig.1*
+%{_mandir}/man1/sip-options.1*
+%{_mandir}/man1/stunc.1*
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/sofia-sip.git/commitdiff/72e49eda4f3e084339d016d88994ce73c07fcc15

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to