rpms/beecrypt/devel beecrypt-4.1.2-no-c++.patch, NONE, 1.1 beecrypt-4.1.2-with-debug.patch, NONE, 1.1 beecrypt.spec, 1.35, 1.36

[Panu Matilainen (pmatilai)]

Author: pmatilai

Update of /cvs/pkgs/rpms/beecrypt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15999

Modified Files:
	beecrypt.spec 
Added Files:
	beecrypt-4.1.2-no-c++.patch beecrypt-4.1.2-with-debug.patch 
Log Message:
- avoid linking against libstdc++ (#165080)
- fix debuginfo contents by building with -g (#250035)
- autoreconf needed for the above, buildrequire autoconf, automake + libtool
- include api documentation in apidocs subpackage
- buildrequire graphviz for generating graphics in apidocs
- license clarification


beecrypt-4.1.2-no-c++.patch:

--- NEW FILE beecrypt-4.1.2-no-c++.patch ---
diff -uNr beecrypt-4.1.2-nocpp/Makefile.am beecrypt-4.1.2/Makefile.am
--- beecrypt-4.1.2-nocpp/Makefile.am	2004-12-22 09:06:31.000000000 +0200
+++ beecrypt-4.1.2/Makefile.am	2007-08-07 08:59:34.000000000 +0300
@@ -49,7 +49,7 @@
 
 libalt_LTLIBRARIES = libbeecrypt.la
 
-libbeecrypt_la_SOURCES = aes.c base64.c beecrypt.c blockmode.c blockpad.c blowfish.c dhaes.c dldp.c dlkp.c dlpk.c dlsvdp-dh.c dsa.c elgamal.c endianness.c entropy.c fips186.c hmac.c hmacmd5.c hmacsha1.c hmacsha256.c md5.c hmacsha384.c hmacsha512.c memchunk.c mp.c mpbarrett.c mpnumber.c mpprime.c mtprng.c pkcs1.c pkcs12.c rsa.c rsakp.c rsapk.c sha1.c sha256.c sha384.c sha512.c sha_k.c timestamp.c cppglue.cxx
+libbeecrypt_la_SOURCES = aes.c base64.c beecrypt.c blockmode.c blockpad.c blowfish.c dhaes.c dldp.c dlkp.c dlpk.c dlsvdp-dh.c dsa.c elgamal.c endianness.c entropy.c fips186.c hmac.c hmacmd5.c hmacsha1.c hmacsha256.c md5.c hmacsha384.c hmacsha512.c memchunk.c mp.c mpbarrett.c mpnumber.c mpprime.c mtprng.c pkcs1.c pkcs12.c rsa.c rsakp.c rsapk.c sha1.c sha256.c sha384.c sha512.c sha_k.c timestamp.c # cppglue.cxx
 libbeecrypt_la_DEPENDENCIES = $(BEECRYPT_OBJECTS)
 libbeecrypt_la_LIBADD = aesopt.lo blowfishopt.lo mpopt.lo sha1opt.lo
 libbeecrypt_la_LDFLAGS = -no-undefined -version-info $(LIBBEECRYPT_LT_CURRENT):$(LIBBEECRYPT_LT_REVISION):$(LIBBEECRYPT_LT_AGE)

beecrypt-4.1.2-with-debug.patch:

--- NEW FILE beecrypt-4.1.2-with-debug.patch ---
diff -up beecrypt-4.1.2/acinclude.m4.withdebug beecrypt-4.1.2/acinclude.m4
--- beecrypt-4.1.2/acinclude.m4.withdebug	2007-08-07 09:17:48.000000000 +0300
+++ beecrypt-4.1.2/acinclude.m4	2007-08-07 09:17:58.000000000 +0300
@@ -459,7 +459,6 @@ AC_DEFUN([BEECRYPT_GNU_CC],[
     CFLAGS="$CFLAGS -Wall -pedantic"
   else
     # Generic optimizations, including cpu tuning
-    BEECRYPT_CFLAGS_REM([-g])
     CFLAGS="$CFLAGS -DNDEBUG -fomit-frame-pointer"
     if test "$bc_cv_c_aggressive_opt" = yes; then
       case $bc_target_cpu in


Index: beecrypt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/beecrypt/devel/beecrypt.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- beecrypt.spec	7 Dec 2006 15:36:32 -0000	1.35
+++ beecrypt.spec	22 Aug 2007 10:19:55 -0000	1.36
@@ -5,16 +5,22 @@
 Summary: An open source cryptography library.
 Name: beecrypt
 Version: 4.1.2
-Release: 12
+Release: 13
 Group: System Environment/Libraries
-License: LGPL
+License: LGPLv2+
 URL: http://sourceforge.net/projects/beecrypt
 Source0: http://prdownloads.sourceforge.net/beecrypt/%{name}-%{version}.tar.gz
 Source1: http://prdownloads.sourceforge.net/beecrypt/%{name}-%{version}.tar.gz.sig
 Patch0: beecrypt-4.1.2-base64.patch
 Patch1: beecrypt-4.1.2-python-api.patch
 Patch2: beecrypt-4.1.2-biarch.patch
-BuildRequires: doxygen tetex-dvips tetex-latex
+Patch3: beecrypt-4.1.2-no-c++.patch
+Patch4: beecrypt-4.1.2-with-debug.patch
+# XXX auto* needed for patches 3 & 4
+BuildRequires: autoconf automake libtool
+BuildRequires: doxygen tetex-dvips tetex-latex 
+# XXX this causes hideous amount of syntax errors from ghostscript... 
+BuildRequires: graphviz
 BuildRequires: m4
 %if %{?with_python:1}0
 BuildRequires: python-devel
@@ -35,6 +41,14 @@
 Beecrypt is a general-purpose cryptography library.  This package contains
 files needed for developing applications with beecrypt.
 
+%package apidocs
+Summary: API documentation for beecrypt
+Group: Documentation
+
+%description apidocs
+Beecrypt is a general-purpose cryptography library. This package contains
+API documentation for developing applications with beecrypt.
+
 %if %{?with_python:1}0
 %package python
 Summary: Files needed for python applications using beecrypt.
@@ -62,6 +76,10 @@
 %patch0 -p1 -b .base64
 %patch1 -p1 -b .python-api
 %patch2 -p1 -b .biarch
+%patch3 -p1 -b .noc++
+%patch4 -p1 -b .withdebug
+
+autoreconf
 
 %build
 
@@ -100,12 +118,16 @@
 
 %files devel
 %defattr(-,root,root)
-%doc BUGS
+%doc BUGS 
 %{_includedir}/%{name}
 %{_libdir}/libbeecrypt.a
 %{_libdir}/libbeecrypt.la
 %{_libdir}/libbeecrypt.so
 
+%files apidocs
+%defattr(-,root,root)
+%doc docs/html
+
 %if %{?with_python:1}0
 %files python
 %defattr(-,root,root)
@@ -121,6 +143,14 @@
 %endif
 
 %changelog
+* Wed Aug 22 2007 Panu Matilainen <pmatilai at redhat.com> - 4.1.2-13
+- avoid linking against libstdc++ (#165080)
+- fix debuginfo contents by building with -g (#250035)
+- autoreconf needed for the above, buildrequire autoconf, automake + libtool
+- include api documentation in apidocs subpackage
+- buildrequire graphviz for generating graphics in apidocs
+- license clarification
+
 * Wed Dec  6 2006 Jeremy Katz <katzj at redhat.com> - 4.1.2-12
 - rebuild against python 2.5
 - follow python packaging guidelines