SPECS (AC-branch): beecrypt.spec - merged from HEAD
baggins
baggins at pld-linux.org
Fri Jun 17 17:48:10 CEST 2005
Author: baggins Date: Fri Jun 17 15:48:10 2005 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- merged from HEAD
---- Files affected:
SPECS:
beecrypt.spec (1.36.2.1 -> 1.36.2.2)
---- Diffs:
================================================================
Index: SPECS/beecrypt.spec
diff -u SPECS/beecrypt.spec:1.36.2.1 SPECS/beecrypt.spec:1.36.2.2
--- SPECS/beecrypt.spec:1.36.2.1 Thu Dec 23 21:36:32 2004
+++ SPECS/beecrypt.spec Fri Jun 17 17:48:04 2005
@@ -1,30 +1,61 @@
# $Revision$, $Date$
#
+# WARNING: despite unchanged SONAME, the RSA ABI (and API) has changed since 3.x!
+#
# Conditional build:
-%bcond_with javaglue # build with Java support
+%bcond_without java # build with Java support
+%bcond_with javac # use javac instead of gcj
%bcond_without python # don't build python module
+%bcond_without doc # don't build documentation
#
Summary: The BeeCrypt Cryptography Library
Summary(pl): Biblioteka kryptograficzna BeeCrypt
Name: beecrypt
-Version: 3.1.0
-Release: 4
+Version: 4.1.2
+Release: 2
Epoch: 2
License: LGPL
Group: Libraries
-Source0: http://dl.sourceforge.net/beecrypt/%{name}-%{version}.tar.gz
-# Source0-md5: 1472cada46e2ab9f532f984de9740386
+Source0: http://heanet.dl.sourceforge.net/beecrypt/%{name}-%{version}.tar.gz
+# Source0-md5: 820d26437843ab0a6a8a5151a73a657c
Patch0: %{name}-opt.patch
-Patch1: %{name}-python.patch
-Patch2: %{name}-lib64_fix.patch
+Patch1: %{name}-lib64_fix.patch
+Patch2: %{name}-ac_python.patch
URL: http://sourceforge.net/projects/beecrypt/
BuildRequires: autoconf >= 2.50
BuildRequires: automake
+%if %{with doc}
+BuildRequires: doxygen
+%endif
+%if %{with java} && !%{with javac}
+BuildRequires: gcc-java
+%endif
+%if %{with doc}
+BuildRequires: ghostscript
+BuildRequires: graphviz
+%endif
+%if %{with java} && %{with javac}
+BuildRequires: jdk
+%endif
BuildRequires: libtool
-%{?with_python:BuildRequires: python-devel}
+%if %{with java} && !%{with javac}
+BuildRequires: libgcj-devel
+%endif
+%if %{with python}
+BuildRequires: python-devel
+BuildRequires: python-modules
+%endif
+BuildRequires: rpmbuild(macros) >= 1.213
+%if %{with doc}
+BuildRequires: tetex-dvips
+BuildRequires: tetex-format-latex
+BuildRequires: tetex-latex-dstroke
+# note: this is incorrect place, it should be somewhere in tetex packages
+BuildRequires: tetex-metafont
+%endif
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%define specflags_alpha -mno-explicit-relocs
+%define specflags_alpha -mno-explicit-relocs
%description
BeeCrypt is an open source cryptography library that contains highly
@@ -61,12 +92,60 @@
%description static -l pl
Biblioteka statyczna BeeCrypt.
+%package doc
+Summary: Development documentation for BeeCrypt
+Summary(pl): Dokumentacja programisty dla biblioteki BeeCrypt
+Group: Documentation
+
+%description doc
+Development documentation for BeeCrypt.
+
+%description doc -l pl
+Dokumentacja programisty dla biblioteki BeeCrypt.
+
+%package java
+Summary: BeeCrypt Java glue library
+Summary(pl): Biblioteka łącząca BeeCrypt z Javą
+Group: Libraries
+Requires: %{name} = %{epoch}:%{version}-%{release}
+
+%description java
+BeeCrypt Java glue library.
+
+%description java -l pl
+Biblioteka łącząca BeeCrypt z Javą.
+
+%package java-devel
+Summary: Development files for BeeCrypt Java glue library
+Summary(pl): Pliki programistyczne biblioteki łączącej Beecrypt z Javą
+Group: Development/Libraries
+Requires: %{name}-devel = %{epoch}:%{version}-%{release}
+Requires: %{name}-java = %{epoch}:%{version}-%{release}
+
+%description java-devel
+Development files for BeeCrypt Java glue library.
+
+%description java-devel -l pl
+Pliki programistyczne biblioteki łączącej Beecrypt z Javą.
+
+%package java-static
+Summary: BeeCrypt Java glue static library
+Summary(pl): Statyczna biblioteka łącząca BeeCrypt z Javą
+Group: Development/Libraries
+Requires: %{name}-java-devel = %{epoch}:%{version}-%{release}
+
+%description java-static
+BeeCrypt Java glue static library.
+
+%description java-static -l pl
+Statyczna biblioteka łącząca BeeCrypt z Javą.
+
%package -n python-beecrypt
Summary: Python interface to BeeCrypt library
Summary(pl): Pythonowy interfejs do biblioteki BeeCrypt
Group: Development/Languages/Python
Requires: %{name} = %{epoch}:%{version}-%{release}
-%pyrequires_eq python
+%pyrequires_eq python-libs
%description -n python-beecrypt
The python-beecrypt package contains a module which permits applications
@@ -78,68 +157,102 @@
Pythonie na używanie interfejsu dostarczanego przez bibliotekę BeeCrytp.
%prep
-%setup -q
+%setup -q
%patch0 -p1
%patch1 -p1
-%patch2
+%patch2 -p1
+
+# --with-cplusplus or building (even empty) *.cxx into libbeecrypt
+# makes it (and thus rpm) depending on libstdc++ which is unacceptable
+%{__perl} -pi -e 's/ cppglue\.cxx$//' Makefile.am
+# only html docs
+%{__perl} -pi -e 's/^GENERATE_LATEX .*/GENERATE_LATEX = NO/' Doxyfile.in
%build
-rm -f missing
%{__libtoolize}
%{__aclocal}
%{__autoconf}
%{__autoheader}
%{__automake}
%configure \
- --with%{!?with_javaglue:out}-javaglue \
+ %{?with_javac:ac_cv_have_gcj=no} \
+ --without-cplusplus \
+ --with%{!?with_java:out}-javaglue \
--with-cpu=%{_target_cpu} \
+%ifarch %{x8664}
+ --with-arch=x86_64 \
+%else
--with-arch=%{_target_cpu} \
+%endif
--with-pic \
--with%{!?with_python:out}-python
-%{__make} \
- libaltdir=%{_libdir} \
- pylibdir=%{py_libdir}
+%{__make}
%if %{with python}
-%{__make} -C python \
- pylibdir=%{py_libdir}
+%{__make} -C python
+%endif
+
+%if %{with doc}
+doxygen
%endif
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_libdir}
%{__make} install \
- libaltdir=%{_libdir} \
DESTDIR=$RPM_BUILD_ROOT
%if %{with python}
%{__make} install -C python \
- libaltdir=%{_libdir} \
- pylibdir=%{py_libdir} \
DESTDIR=$RPM_BUILD_ROOT
%endif
+rm -f $RPM_BUILD_ROOT%{py_sitedir}/*.{la,a}
+
%clean
rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
+%post java -p /sbin/ldconfig
+%postun java -p /sbin/ldconfig
+
%files
%defattr(644,root,root,755)
%doc AUTHORS BENCHMARKS BUGS CONTRIBUTORS NEWS README
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
+%attr(755,root,root) %{_libdir}/libbeecrypt.so.*.*.*
%files devel
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.la
-%{_includedir}/*
+%attr(755,root,root) %{_libdir}/libbeecrypt.so
+%{_libdir}/libbeecrypt.la
+%{_includedir}/beecrypt
%files static
%defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libbeecrypt.a
+
+%if %{with java}
+%files java
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libbeecrypt_java.so.*.*.*
+
+%files java-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libbeecrypt_java.so
+%{_libdir}/libbeecrypt_java.la
+
+%files java-static
+%defattr(644,root,root,755)
+%{_libdir}/libbeecrypt_java.a
+%endif
+
+%if %{with doc}
+%files doc
+%defattr(644,root,root,755)
+%doc docs/html/*
+%endif
%if %{with python}
%files -n python-beecrypt
@@ -153,8 +266,67 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
-Revision 1.36.2.1 2004/12/23 20:36:32 saq
-- release 4 for rebuild with python 2.4
+Revision 1.36.2.2 2005/06/17 15:48:04 baggins
+- merged from HEAD
+
+Revision 1.54 2005/05/11 15:27:01 qboosh
+- use x8664 macro
+
+Revision 1.53 2005/03/21 18:29:53 mmazur
+- rel 2 for th
+
+Revision 1.52 2005/03/19 17:24:41 mmazur
+- s/javaglue/java/ (Gentoo's unification of USE flags is a nice thing you know)
+
+Revision 1.51 2005/02/21 20:39:26 qboosh
+- pass proper arch on amd64 - builds now
+
+Revision 1.50 2005/02/21 09:03:21 qboosh
+- BR s/gcj/gcc-java/
+
+Revision 1.49 2005/02/02 09:12:15 speedy
+- new bcond: doc (don't build documentations)
+
+Revision 1.48 2004/12/30 18:13:11 wolf
+- BR: tetex-metafont (should be somewhere in tetex-*, not here)
+
+Revision 1.47 2004/12/24 16:25:26 qboosh
+- sf workaround
+
+Revision 1.46 2004/12/24 13:21:59 qboosh
+- updated to 4.1.2
+- separated javaglue code, proper java BRs
+
+Revision 1.45 2004/12/21 13:29:11 saq
+- missing BR
+
+Revision 1.44 2004/11/30 21:35:30 pbern
+- add BR: libgcj-devel
+
+Revision 1.43 2004/11/20 19:06:06 qboosh
+- updated to 4.1.1
+
+Revision 1.42 2004/11/20 17:09:02 qboosh
+- doxygen needs ghostscript,tetex-dvips,tetex-format-latex,tetex-latex-dstroke
+- separate html docs to -doc (much larger than -devel)
+
+Revision 1.41 2004/11/18 14:46:03 arekm
+- up to 4.1.0
+
+Revision 1.40 2004/10/31 17:07:10 witekfl
+- documentation generated with doxygen
+- rel 2
+
+Revision 1.39 2004/09/16 19:14:01 twittner
+- added -ac_python.patch - fix for python sitedir path
+- added BR: python-modules
+
+Revision 1.38 2004/08/03 21:41:40 qboosh
+- big fat warning about changed RSA ABI
+
+Revision 1.37 2004/07/31 23:47:40 qboosh
+- updated to 4.0.0, updated opt,lib64_fix patches, removed obsolete python patch
+- cplusplus must stay disabled to avoid rpm dependency on libstdc++
Revision 1.36 2004/07/28 08:03:13 troll
- removed %%include /usr/lib/rpm/macros.python
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/beecrypt.spec?r1=1.36.2.1&r2=1.36.2.2&f=u
More information about the pld-cvs-commit
mailing list