packages: commoncpp2/commoncpp2.spec, commoncpp2/commoncpp2-include.patch (...

qboosh qboosh at pld-linux.org
Mon Jan 2 20:36:08 CET 2012 

Author: qboosh                       Date: Mon Jan  2 19:36:08 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 1.8.1
- removed obsolete lt,gcc4 patches
- added netfilter patch, ensure that NAT is detected after running configure
- added include patch (missing <sys/stat.h> for mkfifo())
- added link patch instead of bogus skip_post_check_so
- added info patch (to unify direntry)

---- Files affected:
packages/commoncpp2:
   commoncpp2.spec (1.29 -> 1.30) , commoncpp2-include.patch (NONE -> 1.1)  (NEW), commoncpp2-info.patch (NONE -> 1.1)  (NEW), commoncpp2-link.patch (NONE -> 1.1)  (NEW), commoncpp2-netfilter.patch (NONE -> 1.1)  (NEW), commoncpp2-gcc4.patch (1.1 -> NONE)  (REMOVED), commoncpp2-lt.patch (1.4 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/commoncpp2/commoncpp2.spec
diff -u packages/commoncpp2/commoncpp2.spec:1.29 packages/commoncpp2/commoncpp2.spec:1.30
--- packages/commoncpp2/commoncpp2.spec:1.29	Wed Nov 24 11:10:42 2010
+++ packages/commoncpp2/commoncpp2.spec	Mon Jan  2 20:36:02 2012
@@ -6,27 +6,28 @@
 Summary:	A GNU package for creating portable C++ programs
 Summary(pl.UTF-8):	Pakiet GNU do tworzenia przenośnych programów w C++
 Name:		commoncpp2
-Version:	1.7.3
-Release:	4
-License:	GPL
+Version:	1.8.1
+Release:	1
+License:	GPL v2+ with linking exception
 Group:		Libraries
 Source0:	http://ftp.gnu.org/gnu/commoncpp/%{name}-%{version}.tar.gz
-# Source0-md5:	ca741179a728d264eb276ae471ebaf70
-Patch0:		%{name}-lt.patch
-Patch1:		%{name}-gcc4.patch
+# Source0-md5:	4804b184e609154ba2bc0aa9f61dc6ef
+Patch0:		%{name}-netfilter.patch
+Patch1:		%{name}-include.patch
+Patch2:		%{name}-link.patch
+Patch3:		%{name}-info.patch
 URL:		http://www.gnu.org/software/commoncpp/
-BuildRequires:	autoconf
+BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
 BuildRequires:	doxygen
 BuildRequires:	libstdc++-devel
-BuildRequires:	libtool
+BuildRequires:	libtool >= 2:1.5
 BuildRequires:	libxml2-devel
 BuildRequires:	openssl-devel
+BuildRequires:	texinfo
 BuildRequires:	zlib-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		skip_post_check_so	libccgnu2-.*\.so\..* libccext2-.*\.so\..*
-
 %description
 This is the second major release of GNU Common C++. GNU Common C++ "2"
 is a GNU package which offers portable "abstraction" of system
@@ -78,6 +79,8 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 %{__libtoolize}
@@ -88,6 +91,10 @@
 %configure \
 	%{!?with_static_libs:--disable-static} \
 	--with-openssl
+
+# ensure netfilter is detected
+grep 'HAVE_NAT_NETFILTER 1' config.h || exit 1
+
 %{__make} -j1
 
 %install
@@ -102,34 +109,39 @@
 %post	-p /sbin/ldconfig
 %postun	-p /sbin/ldconfig
 
-%post devel	-p	/sbin/postshell
+%post	devel -p /sbin/postshell
 -/usr/sbin/fix-info-dir -c %{_infodir}
 
-%postun devel	-p	/sbin/postshell
+%postun	devel -p /sbin/postshell
 -/usr/sbin/fix-info-dir -c %{_infodir}
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS COPYING.addendum NEWS README TODO ChangeLog
-%attr(755,root,root) %{_libdir}/lib*.so.*.*.*
-%ghost %{_libdir}/libccext2-1.7.so.0
-%ghost %{_libdir}/libccgnu2-1.7.so.0
+%doc AUTHORS COPYING.addendum ChangeLog NEWS README SUPPORT THANKS TODO
+%attr(755,root,root) %{_libdir}/libccext2-1.8.so.*.*.*
+%ghost %{_libdir}/libccext2-1.8.so.0
+%attr(755,root,root) %{_libdir}/libccgnu2-1.8.so.*.*.*
+%ghost %{_libdir}/libccgnu2-1.8.so.0
 
 %files devel
 %defattr(644,root,root,755)
-%doc doc/html/*.html doc/html/*.*g*
-%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.la
+%doc doc/html/*.{css,html,js,png}
+%attr(755,root,root) %{_bindir}/ccgnu2-config
+%attr(755,root,root) %{_libdir}/libccext2.so
+%attr(755,root,root) %{_libdir}/libccgnu2.so
+%{_libdir}/libccext2.la
+%{_libdir}/libccgnu2.la
 %{_includedir}/cc++
-%{_aclocaldir}/*.m4
-%{_pkgconfigdir}/*.pc
-%{_infodir}/*.info*
+%{_aclocaldir}/ost_check2.m4
+%{_pkgconfigdir}/libccext2.pc
+%{_pkgconfigdir}/libccgnu2.pc
+%{_infodir}/commoncpp2.info*
 
 %if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libccext2.a
+%{_libdir}/libccgnu2.a
 %endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -138,6 +150,14 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.30  2012/01/02 19:36:02  qboosh
+- updated to 1.8.1
+- removed obsolete lt,gcc4 patches
+- added netfilter patch, ensure that NAT is detected after running configure
+- added include patch (missing <sys/stat.h> for mkfifo())
+- added link patch instead of bogus skip_post_check_so
+- added info patch (to unify direntry)
+
 Revision 1.29  2010/11/24 10:10:42  hawk
 - added required skip_post_check_so
 

================================================================
Index: packages/commoncpp2/commoncpp2-include.patch
diff -u /dev/null packages/commoncpp2/commoncpp2-include.patch:1.1
--- /dev/null	Mon Jan  2 20:36:08 2012
+++ packages/commoncpp2/commoncpp2-include.patch	Mon Jan  2 20:36:02 2012
@@ -0,0 +1,10 @@
+--- commoncpp2-1.8.1/src/applog.cpp.orig	2010-11-01 00:11:55.000000000 +0100
++++ commoncpp2-1.8.1/src/applog.cpp	2012-01-02 19:32:59.313140341 +0100
+@@ -45,6 +45,7 @@
+ #include <cstdlib>
+ #include <stdarg.h>
+ #include <errno.h>
++#include <sys/stat.h>
+ 
+ // TODO sc: test if has to move up now that it is into commoncpp
+ // NOTE: the order of inclusion is important do not move following include line

================================================================
Index: packages/commoncpp2/commoncpp2-info.patch
diff -u /dev/null packages/commoncpp2/commoncpp2-info.patch:1.1
--- /dev/null	Mon Jan  2 20:36:08 2012
+++ packages/commoncpp2/commoncpp2-info.patch	Mon Jan  2 20:36:02 2012
@@ -0,0 +1,14 @@
+--- commoncpp2-1.8.1/doc/commoncpp2.texi.orig	2010-10-31 17:29:17.000000000 +0100
++++ commoncpp2-1.8.1/doc/commoncpp2.texi	2012-01-02 20:11:27.536550962 +0100
+@@ -12,9 +12,9 @@
+ @set VERSION 1.0
+ @set UPDATED September 2002
+ 
+- at dircategory Development
++ at dircategory Libraries:
+ @direntry
+-* GNU Common C++ 2: (commoncpp2).     GNU Common C++ 2 Framework Documentation.
++* GNU Common C++ 2: (commoncpp2).	GNU Common C++ 2 Framework Documentation
+ @end direntry
+ 
+ @c -----------------------------------------------------------------------

================================================================
Index: packages/commoncpp2/commoncpp2-link.patch
diff -u /dev/null packages/commoncpp2/commoncpp2-link.patch:1.1
--- /dev/null	Mon Jan  2 20:36:08 2012
+++ packages/commoncpp2/commoncpp2-link.patch	Mon Jan  2 20:36:02 2012
@@ -0,0 +1,11 @@
+--- commoncpp2-1.8.1/m4/ost_ssl.m4.orig	2010-10-31 23:01:26.000000000 +0100
++++ commoncpp2-1.8.1/m4/ost_ssl.m4	2012-01-02 20:05:34.673205812 +0100
+@@ -41,7 +41,7 @@
+ #       ])
+ #   ],[
+         AC_CHECK_HEADER(openssl/ssl.h,[
+-            SSL_LIBS="-lssl"
++            SSL_LIBS="-lssl -lcrypto"
+             ost_cv_ssl=true
+             AC_DEFINE(CCXX_OPENSSL, [1], [define openssl])
+             AC_DEFINE(CCXX_SSL, [OPENSSL], [defines ssl])

================================================================
Index: packages/commoncpp2/commoncpp2-netfilter.patch
diff -u /dev/null packages/commoncpp2/commoncpp2-netfilter.patch:1.1
--- /dev/null	Mon Jan  2 20:36:08 2012
+++ packages/commoncpp2/commoncpp2-netfilter.patch	Mon Jan  2 20:36:02 2012
@@ -0,0 +1,15 @@
+--- commoncpp2-1.8.1/m4/ost_socket.m4.orig	2010-10-31 23:01:12.000000000 +0100
++++ commoncpp2-1.8.1/m4/ost_socket.m4	2012-01-02 19:23:26.549787830 +0100
+@@ -93,7 +93,11 @@
+                 AC_CHECK_HEADERS([linux/netfilter_ipv4.h linux/netfilter_ipv6.h],,,
+                     [#ifdef HAVE_LIMITS_H
+                     #include <limits.h>
+-                    #endif])
++                    #endif
++                    #include <stddef.h>
++                    #include <sys/socket.h>
++                    #include <linux/in.h>
++                    #include <linux/in6.h>])
+                 if test "$ac_cv_header_linux_netfilter_ipv4_h" = "yes" &&
+                    [ test "$ac_cv_header_linux_netfilter_ipv6_h" = "yes" &&
+                      test "$ost_cv_ipv6" = "yes" ||
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/commoncpp2/commoncpp2.spec?r1=1.29&r2=1.30&f=u

More information about the pld-cvs-commit mailing list