- cleanup, fixed License tag, release 2

diff --git a/libsecp256k1.spec b/libsecp256k1.spec
index e92c10085922648f92bae699302ed2009243d021..e91fcc8fea3aeed8ee8db780f8041e547bb61abe 100644 (file)
--- a/libsecp256k1.spec
+++ b/libsecp256k1.spec
@@ -1,134 +1,89 @@
 # TODO:
-# - configure: Using jni: no
+# - configure: Using jni: no (JNI requires --enable-module-ecdh, which is experimental)
 
 # Conditional build:
-%bcond_with    apidocs         # N/A
-%bcond_without static_libs     # don't build static libraries
+%bcond_without static_libs     # static library
+%bcond_without tests           # unit tests
 #
-Summary:       Bitcoin Cross-Platform C++ Development Toolkit
-# Summary(pl.UTF-8):   -
+Summary:       Optimized C library for EC operations on curve secp256k1
+Summary(pl.UTF-8):     Zoptymalizowana biblioteka C do operacji EC na krzywej secp256k1
 Name:          libsecp256k1
 Version:       0.1.0.13
-Release:       1
-License:       AGPL with a lesser clause
+Release:       2
+License:       MIT
 Group:         Libraries
-Source0:       https://github.com/libbitcoin/secp256k1/archive/v%{version}.tar.gz 
+#Source0Download: https://github.com/libbitcoin/secp256k1/releases
+# TODO: for future releases use:
+#Source0:      https://github.com/libbitcoin/secp256k1/archive/v%{version}/secp256k1-%{version}.tar.gz
+Source0:       https://github.com/libbitcoin/secp256k1/archive/v%{version}.tar.gz
 # Source0-md5: bc3132ab3c57273ed826438306e7fccc
-#Patch0:       %{name}-what.patch
-URL:            https://libbitcoin.org
-#BuildRequires:        -
-BuildRequires: autoconf
+URL:           https://libbitcoin.org/
+BuildRequires: autoconf >= 2.60
 BuildRequires: automake
-#BuildRequires:        intltool
-BuildRequires: libtool
-BuildRequires:  gmp-devel
-#Requires(postun):     -
-#Requires(pre,post):   -
-#Requires(preun):      -
-#Requires:     -
-#Provides:     -
-#Obsoletes:    -
-#Conflicts:    -
+BuildRequires: gmp-devel
+BuildRequires: libtool >= 2:2
+BuildRequires: pkgconfig
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-# do not keep them in newly created specs
-# these are only here to help fixing quickly broken specs
-#%%define              filterout_ld    -Wl,--no-copy-dt-needed-entries
-#%%define              filterout_ld    -Wl,--as-needed
-# do not commit spec containing this (use for local testing only):
-#%%define              filterout_c     -Werror=format-security
-#%%define              filterout_cxx   -Werror=format-security
-
-# Ignore file in __spec_install_post_check_so
-BuildRequires: rpmbuild(macros) >= 1.583
-%define                skip_post_check_so      libunresolved.so.*
-
-# do not commit spec containing this (use for local testing only):
-#%%define              no_install_post_check_tmpfiles  1
-
 %description
-Bitcoin Cross-Platform C++ Development Toolkit
+Optimized C library for EC operations on curve secp256k1.
 
-#%description -l pl.UTF-8
-
-%package common
-Summary:       Common files for %{name} library
-Summary(pl.UTF-8):     Wspólne pliki biblioteki %{name}
-Group:         Libraries
-Requires:      %{name} = %{version}-%{release}
-
-%description common
-Common files for %{name} library.
-
-%description common -l pl.UTF-8
-Wspólne pliki biblioteki %{name}.
+%description -l pl.UTF-8
+Zoptymalizowana biblioteka C do operacji EC na krzywej secp256k1.
 
 %package devel
-Summary:       Header files for %{name} library
-Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki %{name}
+Summary:       Header files for secp256k1 library
+Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki secp256k1
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
+Requires:      gmp-devel
 
 %description devel
-Header files for %{name} library.
+Header files for secp256k1 library.
 
 %description devel -l pl.UTF-8
-Pliki nagłówkowe biblioteki %{name}.
+Pliki nagłówkowe biblioteki secp256k1.
 
 %package static
-Summary:       Static %{name} library
-Summary(pl.UTF-8):     Statyczna biblioteka %{name}
+Summary:       Static secp256k1 library
+Summary(pl.UTF-8):     Statyczna biblioteka secp256k1
 Group:         Development/Libraries
 Requires:      %{name}-devel = %{version}-%{release}
 
 %description static
-Static %{name} library.
+Static secp256k1 library.
 
 %description static -l pl.UTF-8
-Statyczna biblioteka %{name}.
-
-%package apidocs
-Summary:       %{name} API documentation
-Summary(pl.UTF-8):     Dokumentacja API biblioteki %{name}
-Group:         Documentation
-
-%description apidocs
-API documentation for %{name} library.
-
-%description apidocs -l pl.UTF-8
-Dokumentacja API biblioteki %{name}.
+Statyczna biblioteka secp256k1.
 
 %prep
 %setup -q -n secp256k1-%{version}
-#%patch0 -p1
 
 %build
-# if ac/am/lt/* rebuilding is necessary, do it in this order and add
-# appropriate BuildRequires
-#%{__libtoolize}
-#%{__aclocal}
-#%{__autoconf}
-#%{__autoheader}
-#%{__automake}
-./autogen.sh
-# NOTE: --enable-module-recovery  to avoid: https://github.com/libbitcoin/libbitcoin/issues/397
+%{__libtoolize}
+%{__aclocal} -I build-aux/m4
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+# NOTE: --enable-module-recovery to avoid: https://github.com/libbitcoin/libbitcoin/issues/397
 %configure \
+       --disable-silent-rules \
        %{!?with_static_libs:--disable-static} \
        --enable-module-recovery
 %{__make}
+
+%if %{with tests}
 ./tests
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# create directories if necessary
-#install -d $RPM_BUILD_ROOT
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-# if library provides pkgconfig file containing proper {Requires,Libs}.private
-# then remove .la pollution
-#%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
+# obsoleted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libsecp256k1.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -138,35 +93,19 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc README.md
-%attr(755,root,root) %{_libdir}/%{name}.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/%{name}.so.0
-
-# %%files common
-# %defattr(644,root,root,755)
-# %attr(755,root,root) %{_bindir}/%{name}*
-# %{_datadir}/%{name}
+%doc COPYING README.md TODO
+%attr(755,root,root) %{_libdir}/libsecp256k1.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libsecp256k1.so.0
 
 %files devel
 %defattr(644,root,root,755)
-%doc TODO
-%attr(755,root,root) %{_libdir}/%{name}.so
-# if no pkgconfig support, or it misses .private deps, then include .la file
-#%{_libdir}/libFOO.la
-#%%{_includedir}/%{name}
+%attr(755,root,root) %{_libdir}/libsecp256k1.so
 %{_includedir}/secp256k1.h
 %{_includedir}/secp256k1_recovery.h
-#%%{_aclocaldir}/%{name}.m4
-%{_pkgconfigdir}/%{name}.pc
+%{_pkgconfigdir}/libsecp256k1.pc
 
 %if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/%{name}.a
-%endif
-
-%if %{with apidocs}
-%files apidocs
-%defattr(644,root,root,755)
-#%%doc apidocs/*
+%{_libdir}/libsecp256k1.a
 %endif